Fix an out of bounds crash when using Digikam #96065 by Quintin Pan.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 53 insertions, 18 deletions

diff --git a/media-libs/imlib2/ChangeLog b/media-libs/imlib2/ChangeLog
index 7f025f901f7d..907f8e9480cf 100644
--- a/media-libs/imlib2/ChangeLog
+++ b/media-libs/imlib2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/imlib2
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.39 2005/06/04 15:06:58 centic Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.40 2005/07/28 03:15:36 vapier Exp $
+
+  28 Jul 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/imlib-1.2.0-bounds-check.patch, imlib2-1.2.0-r2.ebuild,
+  imlib2-1.2.0.007.ebuild:
+  Fix an out of bounds crash when using Digikam #96065  by Quintin Pan.
 
   04 Jun 2005; Dominik Stadler <centic@gentoo.org> imlib2-1.1.2.ebuild,
   imlib2-1.2.0-r2.ebuild, imlib2-1.2.0.007.ebuild, imlib2-9999.ebuild:
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 1b44a31bc663..6ece3ceb592a 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,22 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 6705d51723f12ae6717d866c4ff883f3 ChangeLog 4267
-MD5 c71d6dfe297ea4a8449c2841238359a2 imlib2-1.1.2.ebuild 1007
-MD5 7267a1aea6a2575755ab21e14edb023e imlib2-1.2.0-r2.ebuild 1092
-MD5 0c36280f1141c2ab86d0bd09ceec038a metadata.xml 2284
+MD5 81998f3d34c245e1c659d83daf551630 imlib2-1.2.0.007.ebuild 1161
+MD5 4795c0cb40349fb84538fe52668f893c imlib2-1.2.0-r2.ebuild 1149
 MD5 806ab39476cce5d3e0206efc7e94c1db imlib2-9999.ebuild 935
-MD5 f0b668b8e855d3dc52520d75e63c50ff imlib2-1.2.0.007.ebuild 1108
-MD5 78f8f17705b3e58fd3f15a898dfa2e25 files/digest-imlib2-1.1.2 64
-MD5 00966d224a91444676648c49ecc1eaf4 files/digest-imlib2-1.2.0-r2 64
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-imlib2-9999 0
-MD5 e493696ea98688132769496642a1044c files/imlib2-1.2.0-loaders.patch 2613
+MD5 0c36280f1141c2ab86d0bd09ceec038a metadata.xml 2284
+MD5 c71d6dfe297ea4a8449c2841238359a2 imlib2-1.1.2.ebuild 1007
+MD5 b9a76957ef894a67df3cfaad22bf8035 ChangeLog 4482
 MD5 1d4f605193247283ce4fac45d2a10c58 files/digest-imlib2-1.2.0.007 68
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-imlib2-9999 0
+MD5 00966d224a91444676648c49ecc1eaf4 files/digest-imlib2-1.2.0-r2 64
 MD5 3a2a6d558d381a6e8355a223b8b0f842 files/imlib2-1.2.0.007-x-typo.patch 298
+MD5 e493696ea98688132769496642a1044c files/imlib2-1.2.0-loaders.patch 2613
+MD5 540efed058c6dccad80586ddd3af9604 files/imlib-1.2.0-bounds-check.patch 1076
+MD5 78f8f17705b3e58fd3f15a898dfa2e25 files/digest-imlib2-1.1.2 64
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCocOx7IRIh26aCTkRArSSAJ4uNIQZ31ZF2wgrlsFU17c+RVOeLwCgnYoc
-WmJxh/+4wZm5k0Q2MtFvYf8=
-=4auo
+iD8DBQFC6E3mgIKl8Uu19MoRAqdhAJ0bNKBWmyu6MRPQ53iY8roHSa3jjwCfUinz
+KiEA2hcEqGOclvI0B5Y4YiI=
+=sf29
 -----END PGP SIGNATURE-----
diff --git a/media-libs/imlib2/files/imlib-1.2.0-bounds-check.patch b/media-libs/imlib2/files/imlib-1.2.0-bounds-check.patch
new file mode 100644
index 000000000000..fcf03be8b0bc
--- /dev/null
+++ b/media-libs/imlib2/files/imlib-1.2.0-bounds-check.patch
@@ -0,0 +1,27 @@
+http://bugs.gentoo.org/show_bug.cgi?id=96065
+http://bugs.kde.org/show_bug.cgi?id=100894
+http://xcomputerman.com/bugs/view.php?id=275
+
+Index: src/lib/rend.c
+===================================================================
+RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/rend.c,v
+retrieving revision 1.1
+retrieving revision 1.2
+diff -u -p -r1.1 -r1.2
+--- src/lib/rend.c	1 Nov 2004 09:45:31 -0000	1.1
++++ src/lib/rend.c	28 Jul 2005 03:10:16 -0000	1.2
+@@ -431,11 +431,11 @@ __imlib_RenderImage(Display * d, ImlibIm
+                           free(back);
+                        return;
+                     }
+-                  memcpy(buf, im->data + ((y + sy) * im->w) + sx,
++                  memcpy(buf, im->data + ((y + sy) * im->w),
+                          im->w * hh * sizeof(DATA32));
+                   __imlib_DataCmodApply(buf, dw, hh, im->w - dw, NULL, cmod);
+-                  pointer = buf;
+-                  jump = 0;
++                  pointer = buf + sx;
++                  jump = im->w - sw;
+                }
+              else
+                {
diff --git a/media-libs/imlib2/imlib2-1.2.0-r2.ebuild b/media-libs/imlib2/imlib2-1.2.0-r2.ebuild
index ad3f7dd66bc3..9089ec079f55 100644
--- a/media-libs/imlib2/imlib2-1.2.0-r2.ebuild
+++ b/media-libs/imlib2/imlib2-1.2.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.2.0-r2.ebuild,v 1.3 2005/06/04 15:06:58 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.2.0-r2.ebuild,v 1.4 2005/07/28 03:15:36 vapier Exp $
 
 EHACKAUTOGEN=yes
 inherit enlightenment
@@ -20,8 +20,9 @@ DEPEND="=media-libs/freetype-2*
 
 src_unpack() {
 	enlightenment_src_unpack
-	cd ${S}
-	epatch ${FILESDIR}/${P}-loaders.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-loaders.patch
+	epatch "${FILESDIR}"/imlib-1.2.0-bounds-check.patch
 }
 
 src_compile() {
diff --git a/media-libs/imlib2/imlib2-1.2.0.007.ebuild b/media-libs/imlib2/imlib2-1.2.0.007.ebuild
index 5c8d71540dcc..d40581291cde 100644
--- a/media-libs/imlib2/imlib2-1.2.0.007.ebuild
+++ b/media-libs/imlib2/imlib2-1.2.0.007.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.2.0.007.ebuild,v 1.4 2005/06/04 15:06:58 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.2.0.007.ebuild,v 1.5 2005/07/28 03:15:36 vapier Exp $
 
 EKEY_STATE=snap
 inherit enlightenment
@@ -22,6 +22,7 @@ src_unpack() {
 	enlightenment_src_unpack
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-x-typo.patch
+	epatch "${FILESDIR}"/imlib-1.2.0-bounds-check.patch
 }
 
 src_compile() {