head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.8
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.6
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.4
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.2
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2010Q2:1.1.0.4
	pkgsrc-2010Q2-base:1.1
	pkgsrc-2010Q1:1.1.0.2;
locks; strict;
comment	@# @;


1.2
date	2010.09.13.04.28.21;	author minskim;	state dead;
branches;
next	1.1;

1.1
date	2010.05.17.20.21.38;	author tez;	state Exp;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2010.05.17.20.21.38;	author tron;	state dead;
branches;
next	1.1.2.2;

1.1.2.2
date	2010.05.17.22.47.52;	author tron;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update dvipng to 1.13.

Changes:
- Add width reporting.
@
text
@$NetBSD: patch-ac,v 1.1 2010/05/17 20:21:38 tez Exp $
CVE-2010-0829

--- set.c	2008-06-11 23:05:01 +0000
+++ set.c	2010-04-27 09:34:06 +0000
@@@@ -203,23 +203,13 @@@@
   }
 }
 
-dviunits SetGlyph(int32_t c, int32_t hh,int32_t vv)
+dviunits SetGlyph(struct char_entry *ptr, int32_t hh,int32_t vv)
 /* gdImageChar can only do monochrome glyphs */
 {
-  register struct char_entry *ptr;
   int dst_alpha,dst_weight,tot_weight,alpha;
   int x,y,pos=0;
   int bgColor,pixelgrey,pixelcolor;
 
-  if (c<0 || c>LASTFNTCHAR) {
-    Warning("glyph index too large (%d), skipping",c);
-    return(0);
-  }
-  ptr=currentfont->chr[c];
-  if (ptr==NULL) {
-    Warning("unable to draw glyph %d, skipping",c);
-    return(0);
-  }
   hh -= ptr->xOffset/shrinkfactor;
   vv -= ptr->yOffset/shrinkfactor;
   /* Initialize persistent color cache. Perhaps this should be in

@


1.1
log
@CVE-2010-0829 fix from https://bugzilla.redhat.com/show_bug.cgi?id=573999
@
text
@d1 1
a1 1
$NetBSD$
@


1.1.2.1
log
@file patch-ac was added on branch pkgsrc-2010Q1 on 2010-05-17 22:47:52 +0000
@
text
@d1 31
@


1.1.2.2
log
@Pullup ticket #3124 - requested by tez
graphics/dvipng: security patch

Revisions pulled up:
- graphics/dvipng/Makefile			1.12
- graphics/dvipng/distinfo			1.3
- graphics/dvipng/patches/patch-aa		1.1
- graphics/dvipng/patches/patch-ab		1.1
- graphics/dvipng/patches/patch-ac		1.1
- graphics/dvipng/patches/patch-ad		1.1
---
Module Name:    pkgsrc
Committed By:   tez
Date:           Mon May 17 20:21:39 UTC 2010

Modified Files:
        pkgsrc/graphics/dvipng: Makefile distinfo
Added Files:
        pkgsrc/graphics/dvipng/patches: patch-aa patch-ab patch-ac patch-ad

Log Message:
CVE-2010-0829 fix from https://bugzilla.redhat.com/show_bug.cgi?id=573999
@
text
@a0 31
$NetBSD: patch-ac,v 1.1 2010/05/17 20:21:38 tez Exp $
CVE-2010-0829

--- set.c	2008-06-11 23:05:01 +0000
+++ set.c	2010-04-27 09:34:06 +0000
@@@@ -203,23 +203,13 @@@@
   }
 }
 
-dviunits SetGlyph(int32_t c, int32_t hh,int32_t vv)
+dviunits SetGlyph(struct char_entry *ptr, int32_t hh,int32_t vv)
 /* gdImageChar can only do monochrome glyphs */
 {
-  register struct char_entry *ptr;
   int dst_alpha,dst_weight,tot_weight,alpha;
   int x,y,pos=0;
   int bgColor,pixelgrey,pixelcolor;
 
-  if (c<0 || c>LASTFNTCHAR) {
-    Warning("glyph index too large (%d), skipping",c);
-    return(0);
-  }
-  ptr=currentfont->chr[c];
-  if (ptr==NULL) {
-    Warning("unable to draw glyph %d, skipping",c);
-    return(0);
-  }
   hh -= ptr->xOffset/shrinkfactor;
   vv -= ptr->yOffset/shrinkfactor;
   /* Initialize persistent color cache. Perhaps this should be in

@