diff options
| author | Robert Schuster <thebohemian@gmx.net> | 2008-02-16 15:09:09 +0000 |
|---|---|---|
| committer | Robert Schuster <thebohemian@gmx.net> | 2008-02-16 15:09:09 +0000 |
| commit | bb9bbef24b7680a453a01643f0cee659cf32dbd3 (patch) | |
| tree | 7a0123ee49cd4fb648e38ab14100503750bce765 /packages/cairo | |
| parent | 8af665768f69f7bc46c9912d849fd59f8bef0a5d (diff) | |
| parent | 4e742a9df221b673cd5cd74affd9d4382cd26c8c (diff) | |
merge of '1821f6eadefc14ad7ce51d5ab026da139608f557'
and 'b214e193f52c5b76dce3027376c5bd7eafce9971'
Diffstat (limited to 'packages/cairo')
| -rw-r--r-- | packages/cairo/cairo-1.4.14/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/cairo/cairo-1.4.14/0001-Fix-for-a-memory-leak-in-pixman.patch | 32 | ||||
| -rw-r--r-- | packages/cairo/cairo_1.4.14.bb | 9 |
3 files changed, 41 insertions, 0 deletions
diff --git a/packages/cairo/cairo-1.4.14/.mtn2git_empty b/packages/cairo/cairo-1.4.14/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/cairo/cairo-1.4.14/.mtn2git_empty diff --git a/packages/cairo/cairo-1.4.14/0001-Fix-for-a-memory-leak-in-pixman.patch b/packages/cairo/cairo-1.4.14/0001-Fix-for-a-memory-leak-in-pixman.patch new file mode 100644 index 0000000000..686ab7ceb0 --- /dev/null +++ b/packages/cairo/cairo-1.4.14/0001-Fix-for-a-memory-leak-in-pixman.patch @@ -0,0 +1,32 @@ +From 7647f29a2a3b69592e38f50890a96d8deeaa2dbb Mon Sep 17 00:00:00 2001
+From: Jan Slupski <jslupski@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;
+
+ diff --git a/packages/cairo/cairo_1.4.14.bb b/packages/cairo/cairo_1.4.14.bb new file mode 100644 index 0000000000..b0f9fe8790 --- /dev/null +++ b/packages/cairo/cairo_1.4.14.bb @@ -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" + |