[oe-commits] org.oe.dev cairo: Added 1.4.14 with pixman memory leak patch, with -1 preference.

[likewise commit]

cairo: Added 1.4.14 with pixman memory leak patch, with -1 preference.

Author: likewise at openembedded.org
Branch: org.openembedded.dev
Revision: efa50d2f263b84fff5481de06517aac16a406c5d
ViewMTN: http://monotone.openembedded.org/revision/info/efa50d2f263b84fff5481de06517aac16a406c5d
Files:
1
packages/cairo/cairo-1.4.14
packages/cairo/cairo-1.4.14/0001-Fix-for-a-memory-leak-in-pixman.patch
packages/cairo/cairo_1.4.14.bb
Diffs:

#
# mt diff -rabbbc2c82991f3b5bd379dc485e515de7efacefb -refa50d2f263b84fff5481de06517aac16a406c5d
#
# 
# 
# add_dir "packages/cairo/cairo-1.4.14"
# 
# add_file "packages/cairo/cairo-1.4.14/0001-Fix-for-a-memory-leak-in-pixman.patch"
#  content [dbefc4dd2f440b1a5a6c7ae578805c15910c2941]
# 
# add_file "packages/cairo/cairo_1.4.14.bb"
#  content [eac43a4d6029b1df29ac83dda4c2cb828ae13783]
# 
============================================================
--- packages/cairo/cairo-1.4.14/0001-Fix-for-a-memory-leak-in-pixman.patch	dbefc4dd2f440b1a5a6c7ae578805c15910c2941
+++ packages/cairo/cairo-1.4.14/0001-Fix-for-a-memory-leak-in-pixman.patch	dbefc4dd2f440b1a5a6c7ae578805c15910c2941
@@ -0,0 +1,32 @@
+From 7647f29a2a3b69592e38f50890a96d8deeaa2dbb Mon Sep 17 00:00:00 2001
+From: Jan Slupski <jslupski at juljas.net>
+Date: Fri, 15 Feb 2008 00:55:30 +0100
+Subject: [PATCH] Fix for a memory leak in pixman.
+
+Port of a 1.6 fix for a memory leak in pixman_region_init_rects/pixman_rect_alloc
+when the count of boxes is 0.
+---
+ pixman/src/pixregion.c |    9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+diff --git a/pixman/src/pixregion.c b/pixman/src/pixregion.c
+index 1ed3ad7..d6caf6c 100644
+--- a/pixman/src/pixregion.c
++++ b/pixman/src/pixregion.c
+@@ -355,6 +355,15 @@ pixman_region_init_rects(pixman_region16_t *region, pixman_box16_t *boxes, int c
+     }
+ 
+     pixman_region_init(region);
++
++    /* if it's 0, don't call pixman_rect_alloc -- 0 rectangles is
++     * a special case, and causing pixman_rect_alloc would cause
++     * us to leak memory (because the 0-rect case should be the
++     * static pixman_region_emptyData data).
++     */
++    if (count == 0)
++        return PIXMAN_REGION_STATUS_SUCCESS;
++
+     if (!pixman_rect_alloc(region, count))
+ 	return PIXMAN_REGION_STATUS_FAILURE;
+ 
+
============================================================
--- packages/cairo/cairo_1.4.14.bb	eac43a4d6029b1df29ac83dda4c2cb828ae13783
+++ packages/cairo/cairo_1.4.14.bb	eac43a4d6029b1df29ac83dda4c2cb828ae13783
@@ -0,0 +1,9 @@
+require cairo.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
+file://0001-Fix-for-a-memory-leak-in-pixman.patch;patch=1;p=1"
+
+PR = "r0"
+