From 60474459dcd5032c8306d169440f2ae2448d30e6 Mon Sep 17 00:00:00 2001 From: joerg Date: Mon, 30 Jul 2007 07:56:27 +0000 Subject: G_INTMAX16 doesn't exist. Assume for now that it means 0x7fff. No cookie for lkundrak. --- graphics/gimp1-base/distinfo | 4 ++-- graphics/gimp1-base/patches/patch-ae | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/graphics/gimp1-base/distinfo b/graphics/gimp1-base/distinfo index e849d3041c1..2ef4c9380bf 100644 --- a/graphics/gimp1-base/distinfo +++ b/graphics/gimp1-base/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2007/07/04 13:44:11 lkundrak Exp $ +$NetBSD: distinfo,v 1.4 2007/07/30 07:56:27 joerg Exp $ SHA1 (gimp-1.2.5.tar.bz2) = 1cb7fdbd4e6b191a62011c906e1b0aaef6e623ef RMD160 (gimp-1.2.5.tar.bz2) = d1be734271b763a22c0e8f5981c5c330a7744d31 @@ -6,4 +6,4 @@ Size (gimp-1.2.5.tar.bz2) = 10885324 bytes SHA1 (patch-aa) = 2d2f7ce110822522314aebfd86c06ebcbdbabb9d SHA1 (patch-ac) = 9949ba730b031132a183cabf69025e36500c70f0 SHA1 (patch-ad) = 29c68f53be2d527661dcbaa38b2bf92626cb139c -SHA1 (patch-ae) = e1b22a857da4a86afcc8d3144379df114a3cf64b +SHA1 (patch-ae) = cf58dd1f447ac147d6e263d8f309d7e86e1a2fb0 diff --git a/graphics/gimp1-base/patches/patch-ae b/graphics/gimp1-base/patches/patch-ae index 8309a4a879b..1ed0d0a3d8d 100644 --- a/graphics/gimp1-base/patches/patch-ae +++ b/graphics/gimp1-base/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.1 2007/07/04 13:44:11 lkundrak Exp $ +$NetBSD: patch-ae,v 1.2 2007/07/30 07:56:27 joerg Exp $ Fix for CVE-2007-2949 heap overflow from upstream. @@ -8,7 +8,7 @@ Fix for CVE-2007-2949 heap overflow from upstream. width = psd_image.layer[layeri].channel[channeli].width; height = psd_image.layer[layeri].channel[channeli].height; -+ if (width > G_MAXINT16 || height > G_MAXINT16) ++ if (width > 0x7FFF || height > 0x7FFF) + { + g_message ("Error: Invalid channel dimensions"); + gimp_quit (); -- cgit v1.2.3