r47281 - in /desktop/unstable/librsvg/debian: changelog patches/01_Revert-bgo-520654-Support-export-id-in-rsvg-convert-.patch patches/20_rsvg_compat.patch patches/30_Don-t-crash-when-filters-don-t-exist.patch patches/series

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Fri Jan 29 14:32:04 UTC 2016 

Author: biebl
Date: Fri Jan 29 14:32:03 2016
New Revision: 47281

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=47281
Log:
Replace 01_Revert-bgo-520654-Support-export-id-in-rsvg-convert-.patch with
a proper upstream fix.

Added:
    desktop/unstable/librsvg/debian/patches/30_Don-t-crash-when-filters-don-t-exist.patch
Removed:
    desktop/unstable/librsvg/debian/patches/01_Revert-bgo-520654-Support-export-id-in-rsvg-convert-.patch
Modified:
    desktop/unstable/librsvg/debian/changelog
    desktop/unstable/librsvg/debian/patches/20_rsvg_compat.patch
    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=47281&op=diff
==============================================================================
--- desktop/unstable/librsvg/debian/changelog	[utf-8] (original)
+++ desktop/unstable/librsvg/debian/changelog	[utf-8] Fri Jan 29 14:32:03 2016
@@ -1,3 +1,10 @@
+librsvg (2.40.13-2) UNRELEASED; urgency=medium
+
+  * Replace 01_Revert-bgo-520654-Support-export-id-in-rsvg-convert-.patch with
+    a proper upstream fix.
+
+ -- Michael Biebl <biebl at debian.org>  Fri, 29 Jan 2016 15:31:10 +0100
+
 librsvg (2.40.13-1) unstable; urgency=medium
 
   * New upstream release.

Modified: desktop/unstable/librsvg/debian/patches/20_rsvg_compat.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/librsvg/debian/patches/20_rsvg_compat.patch?rev=47281&op=diff
==============================================================================
--- desktop/unstable/librsvg/debian/patches/20_rsvg_compat.patch	[utf-8] (original)
+++ desktop/unstable/librsvg/debian/patches/20_rsvg_compat.patch	[utf-8] Fri Jan 29 14:32:03 2016
@@ -1,17 +1,17 @@
-Index: librsvg-2.40.11/rsvg-convert.c
+Index: librsvg-2.40.13/rsvg-convert.c
 ===================================================================
---- librsvg-2.40.11.orig/rsvg-convert.c	2015-11-17 16:59:27.709631303 +0100
-+++ librsvg-2.40.11/rsvg-convert.c	2015-11-17 16:59:27.709631303 +0100
-@@ -126,6 +126,8 @@
-     RsvgHandleFlags flags = RSVG_HANDLE_FLAGS_NONE;
+--- librsvg-2.40.13.orig/rsvg-convert.c	2016-01-29 14:16:21.806607812 +0100
++++ librsvg-2.40.13/rsvg-convert.c	2016-01-29 14:17:33.448096327 +0100
+@@ -140,6 +140,8 @@
      RsvgDimensionData dimensions;
      FILE *output_file = stdout;
+     char *export_lookup_id;
 +    char *basename;
 +    gboolean rsvg_compat = FALSE;
  
  #ifdef G_OS_WIN32
      HANDLE handle;
-@@ -183,6 +185,27 @@
+@@ -199,6 +201,27 @@
          return 0;
      }
  
@@ -39,7 +39,7 @@
      if (output != NULL) {
          output_file = fopen (output, "wb");
          if (!output_file) {
-@@ -194,10 +217,6 @@
+@@ -210,10 +233,6 @@
          g_free (output);
      }
  

Added: desktop/unstable/librsvg/debian/patches/30_Don-t-crash-when-filters-don-t-exist.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/librsvg/debian/patches/30_Don-t-crash-when-filters-don-t-exist.patch?rev=47281&op=file
==============================================================================
--- desktop/unstable/librsvg/debian/patches/30_Don-t-crash-when-filters-don-t-exist.patch	(added)
+++ desktop/unstable/librsvg/debian/patches/30_Don-t-crash-when-filters-don-t-exist.patch	[utf-8] Fri Jan 29 14:32:03 2016
@@ -0,0 +1,53 @@
+From d937c691678803ceda6be701587d997ccd03a1da Mon Sep 17 00:00:00 2001
+From: Benjamin Otte <otte at redhat.com>
+Date: Fri, 29 Jan 2016 12:49:55 +0100
+Subject: [PATCH] Don't crash when filters don't exist
+
+We put a new surface on the stack if a filter existed by name but we
+didn't pop it if the name didn't resolve to a real filter.
+
+New test: crash/bug759084.svg
+
+https://bugzilla.gnome.org/show_bug.cgi?id=759084
+---
+ rsvg-cairo-draw.c                  | 6 +++---
+ tests/fixtures/crash/bug759084.svg | 9 +++++++++
+ 2 files changed, 12 insertions(+), 3 deletions(-)
+ create mode 100644 tests/fixtures/crash/bug759084.svg
+
+diff --git a/rsvg-cairo-draw.c b/rsvg-cairo-draw.c
+index 4d8fbc2..4152cb7 100644
+--- a/rsvg-cairo-draw.c
++++ b/rsvg-cairo-draw.c
+@@ -819,10 +819,10 @@ rsvg_cairo_pop_render_stack (RsvgDrawingCtx * ctx)
+         cairo_surface_t *output;
+ 
+         filter = rsvg_acquire_node (ctx, state->filter);
+-        if (filter && RSVG_NODE_TYPE (filter) == RSVG_NODE_TYPE_FILTER) {
+-            output = render->surfaces_stack->data;
+-            render->surfaces_stack = g_list_delete_link (render->surfaces_stack, render->surfaces_stack);
++        output = render->surfaces_stack->data;
++        render->surfaces_stack = g_list_delete_link (render->surfaces_stack, render->surfaces_stack);
+ 
++        if (filter && RSVG_NODE_TYPE (filter) == RSVG_NODE_TYPE_FILTER) {
+             needs_destroy = TRUE;
+             surface = rsvg_filter_render ((RsvgFilter *) filter, output, ctx, &render->bbox, "2103");
+             /* Don't destroy the output surface, it's owned by child_cr */
+diff --git a/tests/fixtures/crash/bug759084.svg b/tests/fixtures/crash/bug759084.svg
+new file mode 100644
+index 0000000..9e8f8f1
+--- /dev/null
++++ b/tests/fixtures/crash/bug759084.svg
+@@ -0,0 +1,9 @@
++<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
++  <defs>
++    <filter id="filter">
++    </filter>
++  </defs>
++  <g filter="url(#filter)">
++    <rect fill="red" width="10" height="10" filter="url(#doesnotexist)" />
++  </g>
++</svg>
+-- 
+2.7.0
+

Modified: desktop/unstable/librsvg/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/librsvg/debian/patches/series?rev=47281&op=diff
==============================================================================
--- desktop/unstable/librsvg/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/librsvg/debian/patches/series	[utf-8] Fri Jan 29 14:32:03 2016
@@ -1,3 +1,3 @@
-01_Revert-bgo-520654-Support-export-id-in-rsvg-convert-.patch
 10_rsvg-gz.patch
 20_rsvg_compat.patch
+30_Don-t-crash-when-filters-don-t-exist.patch

More information about the pkg-gnome-commits mailing list