diff options
| author | tonnerre <tonnerre> | 2008-04-01 15:51:25 +0000 |
|---|---|---|
| committer | tonnerre <tonnerre> | 2008-04-01 15:51:25 +0000 |
| commit | 2c51f4911ae0539a192c9840f2069413ae72d629 (patch) | |
| tree | bdcc102a10b7863c7f0d1b1f3e13e44a6d3376f8 /x11/p5-Tk | |
| parent | 26d6e28be90413a58eb9f96ae23a76538fa721df (diff) | |
| download | pkgsrc-2c51f4911ae0539a192c9840f2069413ae72d629.tar.gz | |
Fix buffer overflow vulnerability in p5-Tk derived from old code (CVE-2006-4484).
Approved-by: joerg
Diffstat (limited to 'x11/p5-Tk')
| -rw-r--r-- | x11/p5-Tk/Makefile | 4 | ||||
| -rw-r--r-- | x11/p5-Tk/distinfo | 4 | ||||
| -rw-r--r-- | x11/p5-Tk/patches/patch-af | 15 | ||||
| -rw-r--r-- | x11/p5-Tk/patches/patch-ag | 15 |
4 files changed, 35 insertions, 3 deletions
diff --git a/x11/p5-Tk/Makefile b/x11/p5-Tk/Makefile index 7152905ae33..f0e7685dcc2 100644 --- a/x11/p5-Tk/Makefile +++ b/x11/p5-Tk/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.56 2007/09/30 17:45:26 wiz Exp $ +# $NetBSD: Makefile,v 1.57 2008/04/01 15:51:25 tonnerre Exp $ DISTNAME= Tk-804.027 PKGNAME= p5-Tk-804.027 -PKGREVISION= 6 +PKGREVISION= 7 SVR4_PKGNAME= p5tk CATEGORIES= x11 tk perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Tk/} diff --git a/x11/p5-Tk/distinfo b/x11/p5-Tk/distinfo index e42f367adab..61e24a0850d 100644 --- a/x11/p5-Tk/distinfo +++ b/x11/p5-Tk/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2005/12/12 18:04:47 joerg Exp $ +$NetBSD: distinfo,v 1.12 2008/04/01 15:51:25 tonnerre Exp $ SHA1 (Tk-804.027.tar.gz) = a691b6d38783810e3c3a3266bdcf8baba4aaf7dd RMD160 (Tk-804.027.tar.gz) = 8ef2086efa4d7818bd82cc6d36a4d60ca8654bc7 @@ -8,3 +8,5 @@ SHA1 (patch-ab) = 67a2f18ceb289e3503ecb66a35b47915736cc52a SHA1 (patch-ac) = ce3b99157ffd76eb7924321b09ca653a675aaeee SHA1 (patch-ad) = 58095f5b6ca9f0123a057a5411fc546e22303a8f SHA1 (patch-ae) = 865e5d868bac794c6058f5b7465239a4ca968877 +SHA1 (patch-af) = 8c476fc1c10373695b7c8d812fc0d8e5779ec58d +SHA1 (patch-ag) = 0ab118a40fdf9d1d45c93dea624b93c9e8f505ff diff --git a/x11/p5-Tk/patches/patch-af b/x11/p5-Tk/patches/patch-af new file mode 100644 index 00000000000..b58e9baeb99 --- /dev/null +++ b/x11/p5-Tk/patches/patch-af @@ -0,0 +1,15 @@ +$NetBSD: patch-af,v 1.1 2008/04/01 15:51:25 tonnerre Exp $ + +Fix buffer overflow vulnerability derived from old code (CVE-2006-4484). + +--- pTk/mTk/additions/imgGIF.c.orig 2003-12-23 18:00:44.000000000 +0100 ++++ pTk/mTk/additions/imgGIF.c +@@ -776,7 +776,7 @@ ReadImage(interp, imagePtr, handle, len, + /* + * Initialize the decoder + */ +- if (! ReadOK(handle,&initialCodeSize,1)) { ++ if (! ReadOK(handle,&initialCodeSize,1) || initialCodeSize > MAX_LWZ_BITS) { + Tcl_AppendResult(interp, "error reading GIF image: ", + Tcl_PosixError(interp), (char *) NULL); + return TCL_ERROR; diff --git a/x11/p5-Tk/patches/patch-ag b/x11/p5-Tk/patches/patch-ag new file mode 100644 index 00000000000..291f53b457e --- /dev/null +++ b/x11/p5-Tk/patches/patch-ag @@ -0,0 +1,15 @@ +$NetBSD: patch-ag,v 1.1 2008/04/01 15:51:25 tonnerre Exp $ + +Fix buffer overflow vulnerability derived from old code (CVE-2006-4484). + +--- pTk/mTk/generic/tkImgGIF.c.orig 2004-02-29 11:20:28.000000000 +0100 ++++ pTk/mTk/generic/tkImgGIF.c +@@ -826,7 +826,7 @@ ReadImage(interp, imagePtr, chan, len, r + /* + * Initialize the decoder + */ +- if (! ReadOK(chan, &initialCodeSize, 1)) { ++ if (! ReadOK(chan, &initialCodeSize, 1) || initialCodeSize > MAX_LWZ_BITS) { + Tcl_AppendResult(interp, "error reading GIF image: ", + Tcl_PosixError(interp), (char *) NULL); + return TCL_ERROR; |