diff options
| author | drochner <drochner@pkgsrc.org> | 2010-11-03 11:56:37 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2010-11-03 11:56:37 +0000 |
| commit | b71ade83dbb8c22c8e1037bb4a44936a5f3abefd (patch) | |
| tree | edbcbce9e636ed31476cc38a66012cd742b22bf6 /graphics | |
| parent | 27eedfe7b1110afa2198738138c573e08e88915c (diff) | |
| download | pkgsrc-b71ade83dbb8c22c8e1037bb4a44936a5f3abefd.tar.gz | |
add patch from upstream CVS to fix a possible buffer overflow
when processing TrueType GX fonts (SA41738), bump PKGREVISION
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/freetype2/Makefile | 3 | ||||
| -rw-r--r-- | graphics/freetype2/distinfo | 3 | ||||
| -rw-r--r-- | graphics/freetype2/patches/patch-ab | 22 |
3 files changed, 26 insertions, 2 deletions
diff --git a/graphics/freetype2/Makefile b/graphics/freetype2/Makefile index 6008793ecdb..476d1fa168b 100644 --- a/graphics/freetype2/Makefile +++ b/graphics/freetype2/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.75 2010/10/22 16:14:13 drochner Exp $ +# $NetBSD: Makefile,v 1.76 2010/11/03 11:56:37 drochner Exp $ DISTNAME= freetype-2.4.3 PKGNAME= ${DISTNAME:S/-/2-/} +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=freetype/} \ ftp://ring.aist.go.jp/pub/graphics/freetype/freetype2/ diff --git a/graphics/freetype2/distinfo b/graphics/freetype2/distinfo index 46c914fc8a3..4985ef40313 100644 --- a/graphics/freetype2/distinfo +++ b/graphics/freetype2/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.37 2010/10/22 16:14:13 drochner Exp $ +$NetBSD: distinfo,v 1.38 2010/11/03 11:56:37 drochner Exp $ SHA1 (freetype-2.4.3.tar.bz2) = 16e5ba0ff23b2de372149a790b7245a762022912 RMD160 (freetype-2.4.3.tar.bz2) = befa7c66a9574c682b45d69a1088d072d8f119d9 Size (freetype-2.4.3.tar.bz2) = 1437406 bytes SHA1 (patch-aa) = 85bf9979802e04345a9f5ac3ada2cac9520dabcb +SHA1 (patch-ab) = 1514cd5ef494a535db75e072ba194ea2936f6623 diff --git a/graphics/freetype2/patches/patch-ab b/graphics/freetype2/patches/patch-ab new file mode 100644 index 00000000000..98557517a07 --- /dev/null +++ b/graphics/freetype2/patches/patch-ab @@ -0,0 +1,22 @@ +$NetBSD: patch-ab,v 1.14 2010/11/03 11:56:37 drochner Exp $ + +--- src/truetype/ttgxvar.c.orig 2010-07-12 19:03:49.000000000 +0000 ++++ src/truetype/ttgxvar.c +@@ -154,7 +154,7 @@ + runcnt = runcnt & GX_PT_POINT_RUN_COUNT_MASK; + first = points[i++] = FT_GET_USHORT(); + +- if ( runcnt < 1 ) ++ if ( runcnt < 1 || i + runcnt >= n ) + goto Exit; + + /* first point not included in runcount */ +@@ -165,7 +165,7 @@ + { + first = points[i++] = FT_GET_BYTE(); + +- if ( runcnt < 1 ) ++ if ( runcnt < 1 || i + runcnt >= n ) + goto Exit; + + for ( j = 0; j < runcnt; ++j ) |