diff options
| author | drochner <drochner@pkgsrc.org> | 2011-03-08 17:13:33 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2011-03-08 17:13:33 +0000 |
| commit | 71b2570dc8238cec46343acaa75103b4d4ede8ec (patch) | |
| tree | 68c777c784dcbb422af09457fd7c79578847a906 /fonts | |
| parent | d7f8d53a3108720948ff05156820765bd2b66ba7 (diff) | |
| download | pkgsrc-71b2570dc8238cec46343acaa75103b4d4ede8ec.tar.gz | |
adopt evince/patch-ba to fix 2 possible buffer overflows in AFM file
parsing (SA43491), bump PKGREV
Diffstat (limited to 'fonts')
| -rw-r--r-- | fonts/t1lib/Makefile | 4 | ||||
| -rw-r--r-- | fonts/t1lib/distinfo | 3 | ||||
| -rw-r--r-- | fonts/t1lib/patches/patch-ai | 22 |
3 files changed, 26 insertions, 3 deletions
diff --git a/fonts/t1lib/Makefile b/fonts/t1lib/Makefile index e0f9ad4abb3..88ad763edc3 100644 --- a/fonts/t1lib/Makefile +++ b/fonts/t1lib/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.42 2010/07/08 18:48:47 jdolecek Exp $ +# $NetBSD: Makefile,v 1.43 2011/03/08 17:13:33 drochner Exp $ DISTNAME= t1lib-5.1.2 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= fonts devel graphics MASTER_SITES= ${MASTER_SITE_SUNSITE:=libs/graphics/} diff --git a/fonts/t1lib/distinfo b/fonts/t1lib/distinfo index 31bc4777bc9..7b85fb38eed 100644 --- a/fonts/t1lib/distinfo +++ b/fonts/t1lib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.19 2008/02/11 18:53:38 bjs Exp $ +$NetBSD: distinfo,v 1.20 2011/03/08 17:13:33 drochner Exp $ SHA1 (t1lib-5.1.2.tar.gz) = 4b4fc22c8688eefaaa8cfc990f0039f95f4287de RMD160 (t1lib-5.1.2.tar.gz) = ab22aea390356750d743c0f4b08762aa76ca2a82 @@ -8,3 +8,4 @@ SHA1 (patch-ac) = 14201794e29a2eeba22a9144726ed3e00322aa1d SHA1 (patch-ad) = 29c530f6d363de31777ad45823b55e72208c4ccb SHA1 (patch-af) = e89df0d94e0748e468c7c3d40ce2fc0ccdb0116c SHA1 (patch-ah) = 60ead43eeb6327cd3fd94755364633b6bf5d5d0d +SHA1 (patch-ai) = 176ed28f114f64c5e97e7c00c684a74895de2df3 diff --git a/fonts/t1lib/patches/patch-ai b/fonts/t1lib/patches/patch-ai new file mode 100644 index 00000000000..e2a7efce5fa --- /dev/null +++ b/fonts/t1lib/patches/patch-ai @@ -0,0 +1,22 @@ +$NetBSD: patch-ai,v 1.3 2011/03/08 17:13:33 drochner Exp $ + +--- lib/t1lib/parseAFM.c.orig 2007-12-23 15:49:42.000000000 +0000 ++++ lib/t1lib/parseAFM.c +@@ -199,7 +199,7 @@ static char *token(stream) + idx = 0; + + while (ch != EOF && ch != ' ' && ch != CR && ch != LF && +- ch != CTRL_Z && ch != '\t' && ch != ':' && ch != ';'){ ++ ch != CTRL_Z && ch != '\t' && ch != ':' && ch != ';' && idx < MAX_NAME){ + ident[idx++] = ch; + ch = fgetc(stream); + } /* while */ +@@ -235,7 +235,7 @@ static char *linetoken(stream) + while ((ch = fgetc(stream)) == ' ' || ch == '\t' ); + + idx = 0; +- while (ch != EOF && ch != CR && ch != LF && ch != CTRL_Z) ++ while (ch != EOF && ch != CR && ch != LF && ch != CTRL_Z && idx < MAX_NAME) + { + ident[idx++] = ch; + ch = fgetc(stream); |