r29618 - in /desktop/unstable/librsvg/debian: changelog patches/01_null_crash.patch patches/series

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Thu Sep  8 12:47:52 2011
New Revision: 29618

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29618
Log:
Add 01_null_crash.patch: Fix crash on some broken SVGs. Patch by Bruno
Girin. (GNOME #626559, LP #608026)

Added:
    desktop/unstable/librsvg/debian/patches/01_null_crash.patch
Modified:
    desktop/unstable/librsvg/debian/changelog
    desktop/unstable/librsvg/debian/patches/series

Modified: desktop/unstable/librsvg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/librsvg/debian/changelog?rev=29618&op=diff
==============================================================================
--- desktop/unstable/librsvg/debian/changelog [utf-8] (original)
+++ desktop/unstable/librsvg/debian/changelog [utf-8] Thu Sep  8 12:47:52 2011
@@ -7,6 +7,8 @@
     - Store node type separately in RsvgNode (#658014)
     - [CVE-2011-3146]
   * debian/control.in: Add Vcs-* fields.
+  * Add 01_null_crash.patch: Fix crash on some broken SVGs. Patch by Bruno
+    Girin. (GNOME #626559, LP #608026)
 
  -- Martin Pitt <mpitt at debian.org>  Thu, 08 Sep 2011 14:20:28 +0200
 

Added: desktop/unstable/librsvg/debian/patches/01_null_crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/librsvg/debian/patches/01_null_crash.patch?rev=29618&op=file
==============================================================================
--- desktop/unstable/librsvg/debian/patches/01_null_crash.patch (added)
+++ desktop/unstable/librsvg/debian/patches/01_null_crash.patch [utf-8] Thu Sep  8 12:47:52 2011
@@ -1,0 +1,19 @@
+Description: don't crash on corrupted svg
+Author: Bruno Girin <brunogirin at gmail.com>
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=626559
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/608026
+
+=== modified file 'rsvg-paint-server.c'
+Index: librsvg-2.32.1/rsvg-paint-server.c
+===================================================================
+--- librsvg-2.32.1.orig/rsvg-paint-server.c	2010-05-31 07:21:34.000000000 +1000
++++ librsvg-2.32.1/rsvg-paint-server.c	2010-11-16 09:30:22.813990003 +1100
+@@ -118,7 +118,7 @@
+     guint32 rgb;
+     if (inherit != NULL)
+         *inherit = 1;
+-    if (!strcmp (str, "none"))
++    if (str == NULL || !strcmp (str, "none"))
+         return NULL;
+ 
+     name = rsvg_get_url_string (str);

Modified: desktop/unstable/librsvg/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/librsvg/debian/patches/series?rev=29618&op=diff
==============================================================================
--- desktop/unstable/librsvg/debian/patches/series [utf-8] (original)
+++ desktop/unstable/librsvg/debian/patches/series [utf-8] Thu Sep  8 12:47:52 2011
@@ -1,2 +1,3 @@
+01_null_crash.patch
 10_rsvg-gz.patch
 99_ltmain_as-needed.patch