Accepting request 182565 from GNOME:Factory

- Add cairo-reduce-buddy-assertion.patch: Fix eog crash on
  assertion, after pressing Next (bnc#828074).

OBS-URL: https://build.opensuse.org/request/show/182565
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cairo?expand=0&rev=56

cairo-reduce-buddy-assertion.patch

@@ -0,0 +1,34 @@
+From 01a8bf01c6508a4fea8d40371c3049e7a2f7908a Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri, 15 Mar 2013 09:08:00 +0000
+Subject: [PATCH] mempool: Reduce an assert into an error return for
+ get_buddy()
+
+If we ask for a buddy that is outside of our allocation that is an
+error that should not happen with a power-of-two allocated zone...
+However, since it has been seen in the wild, we can safely return that
+there is no buddy rather than die in a too-late assert.
+
+Reported-by: Anton Eliasson <devel@antoneliasson.se>
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+ src/cairo-mempool.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/cairo-mempool.c b/src/cairo-mempool.c
+index 96e4a62..751ede3 100644
+--- a/src/cairo-mempool.c
++++ b/src/cairo-mempool.c
+@@ -157,7 +157,8 @@ get_buddy (cairo_mempool_t *pool, size_t offset, int bits)
+ {
+     struct _cairo_memblock *block;
+ 
+-    assert (offset + (1 << bits) <= pool->num_blocks);
++    if (offset + (1 << bits) >= pool->num_blocks)
++	return NULL; /* invalid */
+ 
+     if (BITTEST (pool, offset + (1 << bits) - 1))
+ 	return NULL; /* buddy is allocated */
+-- 
+1.8.1.4
+

cairo.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jul  8 18:49:31 CEST 2013 - sbrabec@suse.cz
+
+- Add cairo-reduce-buddy-assertion.patch: Fix eog crash on
+  assertion, after pressing Next (bnc#828074).
+
 -------------------------------------------------------------------
 Sat May 25 20:58:42 UTC 2013 - dimstar@opensuse.org
 

cairo.spec

@@ -30,6 +30,8 @@ Source:         http://cairographics.org/releases/%{name}-%{version}.tar.xz
 Source99:       baselibs.conf
 # PATCH-FIX-UPSTREAM cairo-modules-no-version.patch fdo#29319 dimstar@opensuse.org -- Build modules with -module -avoid-version.
 Patch0:         cairo-modules-no-version.patch
+# PATCH-FIX-UPSTREAM cairo-reduce-buddy-assertion.patch bnc#828074 sbrabec@suse.cz -- Fix assert crash on unaligned memory, taken from git, commit 01a8bf0
+Patch1:         cairo-reduce-buddy-assertion.patch
 # These libraries are needed only for tests.
 # Do not enable tests in build systems, it causes build loop!
 #BuildRequires:  librsvg-devel poppler-devel
@@ -148,6 +150,7 @@ cairo.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 # Needed by patch0