r50229 - in /desktop/unstable/gdk-pixbuf/debian: changelog patches/02-tests-Make-sure-to-NULL-terminate-the-arguments-pass.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Sep  8 16:58:54 2016
New Revision: 50229

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=50229
Log:
Make sure to NULL terminate the arguments passed to g_test_get_filename().
Otherwise the /pixbuf/composite2 test will segfault. (Closes: #837030)

Added:
    desktop/unstable/gdk-pixbuf/debian/patches/02-tests-Make-sure-to-NULL-terminate-the-arguments-pass.patch
Modified:
    desktop/unstable/gdk-pixbuf/debian/changelog
    desktop/unstable/gdk-pixbuf/debian/patches/series

Modified: desktop/unstable/gdk-pixbuf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdk-pixbuf/debian/changelog?rev=50229&op=diff
==============================================================================
--- desktop/unstable/gdk-pixbuf/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gdk-pixbuf/debian/changelog	[utf-8] Thu Sep  8 16:58:54 2016
@@ -1,3 +1,10 @@
+gdk-pixbuf (2.35.4-3) UNRELEASED; urgency=medium
+
+  * Make sure to NULL terminate the arguments passed to g_test_get_filename().
+    Otherwise the /pixbuf/composite2 test will segfault. (Closes: #837030)
+
+ -- Michael Biebl <biebl at debian.org>  Thu, 08 Sep 2016 18:57:47 +0200
+
 gdk-pixbuf (2.35.4-2) unstable; urgency=medium
 
   * Make test-suite failures non-fatal for now to not block ongoing

Added: desktop/unstable/gdk-pixbuf/debian/patches/02-tests-Make-sure-to-NULL-terminate-the-arguments-pass.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdk-pixbuf/debian/patches/02-tests-Make-sure-to-NULL-terminate-the-arguments-pass.patch?rev=50229&op=file
==============================================================================
--- desktop/unstable/gdk-pixbuf/debian/patches/02-tests-Make-sure-to-NULL-terminate-the-arguments-pass.patch	(added)
+++ desktop/unstable/gdk-pixbuf/debian/patches/02-tests-Make-sure-to-NULL-terminate-the-arguments-pass.patch	[utf-8] Thu Sep  8 16:58:54 2016
@@ -0,0 +1,29 @@
+From eeafd3e09db2a9852ce2251d6dd4ce1c0ebcb517 Mon Sep 17 00:00:00 2001
+From: Michael Biebl <biebl at debian.org>
+Date: Thu, 8 Sep 2016 18:52:16 +0200
+Subject: [PATCH] tests: Make sure to NULL terminate the arguments passed to
+ g_test_get_filename()
+
+Otherwise the /pixbuf/composite2 test will segfault
+
+https://bugzilla.gnome.org/show_bug.cgi?id=771026
+---
+ tests/pixbuf-composite.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/pixbuf-composite.c b/tests/pixbuf-composite.c
+index f6b5feb..d701f47 100644
+--- a/tests/pixbuf-composite.c
++++ b/tests/pixbuf-composite.c
+@@ -64,7 +64,7 @@ test_composite2 (void)
+   GdkPixbuf *src, *dest;
+   guchar *pixels, *p;
+ 
+-  src = gdk_pixbuf_new_from_file (g_test_get_filename (G_TEST_DIST, "test-image.png"), NULL);
++  src = gdk_pixbuf_new_from_file (g_test_get_filename (G_TEST_DIST, "test-image.png", NULL), NULL);
+ 
+   {
+     GdkPixbuf *tmp = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
+-- 
+2.9.3
+

Modified: desktop/unstable/gdk-pixbuf/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdk-pixbuf/debian/patches/series?rev=50229&op=diff
==============================================================================
--- desktop/unstable/gdk-pixbuf/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gdk-pixbuf/debian/patches/series	[utf-8] Thu Sep  8 16:58:54 2016
@@ -1 +1,2 @@
 01-disable-oom-test.patch
+02-tests-Make-sure-to-NULL-terminate-the-arguments-pass.patch