| 1 |
cardoe 08/06/12 14:56:12 |
| 2 |
|
| 3 |
Added: pixman-0.11.4-memleak.patch |
| 4 |
Log: |
| 5 |
fix #225907. Patch by Maximilian Grothusmann <maxi@××××××××.net> fixing the memory leak |
| 6 |
(Portage version: 2.1.5.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 x11-libs/pixman/files/pixman-0.11.4-memleak.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/pixman/files/pixman-0.11.4-memleak.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/pixman/files/pixman-0.11.4-memleak.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: pixman-0.11.4-memleak.patch |
| 15 |
=================================================================== |
| 16 |
diff --git a/pixman/pixman-region16.c b/pixman/pixman-region16.c |
| 17 |
index 1a0edfe..869e18d 100644 |
| 18 |
--- a/pixman/pixman-region16.c |
| 19 |
+++ b/pixman/pixman-region16.c |
| 20 |
@@ -47,6 +47,7 @@ pixman_region16_copy_from_region32 (pixman_region16_t *dst, |
| 21 |
int n_boxes, i; |
| 22 |
pixman_box32_t *boxes32; |
| 23 |
pixman_box16_t *boxes16; |
| 24 |
+ pixman_bool_t retval; |
| 25 |
|
| 26 |
boxes32 = pixman_region32_rectangles (src, &n_boxes); |
| 27 |
|
| 28 |
@@ -64,7 +65,9 @@ pixman_region16_copy_from_region32 (pixman_region16_t *dst, |
| 29 |
} |
| 30 |
|
| 31 |
pixman_region_fini (dst); |
| 32 |
- return pixman_region_init_rects (dst, boxes16, n_boxes); |
| 33 |
+ retval = pixman_region_init_rects (dst, boxes16, n_boxes); |
| 34 |
+ free (boxes16); |
| 35 |
+ return retval; |
| 36 |
} |
| 37 |
|
| 38 |
#include "pixman-region.c" |
| 39 |
diff --git a/pixman/pixman-region32.c b/pixman/pixman-region32.c |
| 40 |
index 4b5598d..6e083b5 100644 |
| 41 |
--- a/pixman/pixman-region32.c |
| 42 |
+++ b/pixman/pixman-region32.c |
| 43 |
@@ -45,6 +45,7 @@ pixman_region32_copy_from_region16 (pixman_region32_t *dst, |
| 44 |
int n_boxes, i; |
| 45 |
pixman_box16_t *boxes16; |
| 46 |
pixman_box32_t *boxes32; |
| 47 |
+ pixman_bool_t retval; |
| 48 |
|
| 49 |
boxes16 = pixman_region_rectangles (src, &n_boxes); |
| 50 |
|
| 51 |
@@ -62,7 +63,9 @@ pixman_region32_copy_from_region16 (pixman_region32_t *dst, |
| 52 |
} |
| 53 |
|
| 54 |
pixman_region32_fini (dst); |
| 55 |
- return pixman_region32_init_rects (dst, boxes32, n_boxes); |
| 56 |
+ retval = pixman_region32_init_rects (dst, boxes32, n_boxes); |
| 57 |
+ free (boxes32); |
| 58 |
+ return retval; |
| 59 |
} |
| 60 |
|
| 61 |
#include "pixman-region.c" |
| 62 |
|
| 63 |
|
| 64 |
|
| 65 |
-- |
| 66 |
gentoo-commits@l.g.o mailing list |
Archives