fix #225907. Patch by Maximilian Grothusmann <maxi@own-hero.net> fixing the memory leak

(Portage version: 2.1.5.4)

3 files changed, 67 insertions, 1 deletions

diff --git a/x11-libs/pixman/ChangeLog b/x11-libs/pixman/ChangeLog
index 327aa881af28..86d1dc248728 100644
--- a/x11-libs/pixman/ChangeLog
+++ b/x11-libs/pixman/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/pixman
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/ChangeLog,v 1.11 2008/06/10 00:39:14 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/ChangeLog,v 1.12 2008/06/12 14:56:11 cardoe Exp $
+
+*pixman-0.11.4-r1 (12 Jun 2008)
+
+  12 Jun 2008; Doug Goldstein <cardoe@gentoo.org>
+  +files/pixman-0.11.4-memleak.patch, +pixman-0.11.4-r1.ebuild:
+  fix #225907. Patch by Maximilian Grothusmann <maxi@own-hero.net> fixing
+  the memory leak
 
 *pixman-0.11.4 (10 Jun 2008)
 
diff --git a/x11-libs/pixman/files/pixman-0.11.4-memleak.patch b/x11-libs/pixman/files/pixman-0.11.4-memleak.patch
new file mode 100644
index 000000000000..e33a84f758f6
--- /dev/null
+++ b/x11-libs/pixman/files/pixman-0.11.4-memleak.patch
@@ -0,0 +1,46 @@
+diff --git a/pixman/pixman-region16.c b/pixman/pixman-region16.c
+index 1a0edfe..869e18d 100644
+--- a/pixman/pixman-region16.c
++++ b/pixman/pixman-region16.c
+@@ -47,6 +47,7 @@ pixman_region16_copy_from_region32 (pixman_region16_t *dst,
+     int n_boxes, i;
+     pixman_box32_t *boxes32;
+     pixman_box16_t *boxes16;
++    pixman_bool_t retval;
+     
+     boxes32 = pixman_region32_rectangles (src, &n_boxes);
+ 
+@@ -64,7 +65,9 @@ pixman_region16_copy_from_region32 (pixman_region16_t *dst,
+     }
+ 
+     pixman_region_fini (dst);
+-    return pixman_region_init_rects (dst, boxes16, n_boxes);
++    retval = pixman_region_init_rects (dst, boxes16, n_boxes);
++    free (boxes16);
++    return retval;
+ }
+ 
+ #include "pixman-region.c"
+diff --git a/pixman/pixman-region32.c b/pixman/pixman-region32.c
+index 4b5598d..6e083b5 100644
+--- a/pixman/pixman-region32.c
++++ b/pixman/pixman-region32.c
+@@ -45,6 +45,7 @@ pixman_region32_copy_from_region16 (pixman_region32_t *dst,
+     int n_boxes, i;
+     pixman_box16_t *boxes16;
+     pixman_box32_t *boxes32;
++    pixman_bool_t retval;
+     
+     boxes16 = pixman_region_rectangles (src, &n_boxes);
+ 
+@@ -62,7 +63,9 @@ pixman_region32_copy_from_region16 (pixman_region32_t *dst,
+     }
+ 
+     pixman_region32_fini (dst);
+-    return pixman_region32_init_rects (dst, boxes32, n_boxes);
++    retval = pixman_region32_init_rects (dst, boxes32, n_boxes);
++    free (boxes32);
++    return retval;
+ }
+ 
+ #include "pixman-region.c"
diff --git a/x11-libs/pixman/pixman-0.11.4-r1.ebuild b/x11-libs/pixman/pixman-0.11.4-r1.ebuild
new file mode 100644
index 000000000000..e92b17549d12
--- /dev/null
+++ b/x11-libs/pixman/pixman-0.11.4-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.11.4-r1.ebuild,v 1.1 2008/06/12 14:56:11 cardoe Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+PATCHES="${FILESDIR}/${PN}-0.11.4-memleak.patch"
+
+inherit x-modular
+
+DESCRIPTION="Low-level pixel manipulation routines"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"