r35834 - in /desktop/unstable/glib2.0/debian: changelog patches/20_glib-compile-resources_leak.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Fri Sep 28 19:34:06 2012
New Revision: 35834

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35834
Log:
20_glib-compile-resources_leak.patch: new patch. Fix a leak 
introduced in version 2.32.4. Thanks Niels Thykier!

Added:
    desktop/unstable/glib2.0/debian/patches/20_glib-compile-resources_leak.patch
Modified:
    desktop/unstable/glib2.0/debian/changelog
    desktop/unstable/glib2.0/debian/patches/series

Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=35834&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog [utf-8] Fri Sep 28 19:34:06 2012
@@ -3,6 +3,8 @@
   * Revert link adding for gdbus-object-manager-example. While it is 
     useful to have in /usr/share/doc as an example, it must not be 
     shipped with the system documentation.
+  * 20_glib-compile-resources_leak.patch: new patch. Fix a leak 
+    introduced in version 2.32.4. Thanks Niels Thykier!
 
  -- Josselin Mouette <joss at debian.org>  Sun, 23 Sep 2012 13:26:33 +0200
 

Added: desktop/unstable/glib2.0/debian/patches/20_glib-compile-resources_leak.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/20_glib-compile-resources_leak.patch?rev=35834&op=file
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/20_glib-compile-resources_leak.patch (added)
+++ desktop/unstable/glib2.0/debian/patches/20_glib-compile-resources_leak.patch [utf-8] Fri Sep 28 19:34:06 2012
@@ -1,0 +1,36 @@
+Index: glib2.0-2.33.12+really2.32.4/gio/glib-compile-resources.c
+===================================================================
+--- glib2.0-2.33.12+really2.32.4.orig/gio/glib-compile-resources.c	2012-07-14 22:33:11.000000000 +0200
++++ glib2.0-2.33.12+really2.32.4/gio/glib-compile-resources.c	2012-09-28 21:32:32.168548276 +0200
+@@ -272,7 +272,6 @@ end_element (GMarkupParseContext  *conte
+       if (state->preproc_options)
+         {
+           gchar **options;
+-          gchar *stderr_child = NULL;
+           guint i;
+           gboolean xml_stripblanks = FALSE;
+           gboolean to_pixdata = FALSE;
+@@ -298,6 +297,7 @@ end_element (GMarkupParseContext  *conte
+           if (xml_stripblanks && xmllint != NULL)
+             {
+               gchar *argv[8];
++              gchar *stderr_child = NULL;
+               int status, fd, argc;
+ 
+               tmp_file = g_strdup ("resource-XXXXXXXX");
+@@ -336,6 +336,7 @@ end_element (GMarkupParseContext  *conte
+                 {
+                   g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+                                _("Error processing input file with xmllint:\n%s"), stderr_child);
++                  g_free (stderr_child);
+                   goto cleanup;
+                 }
+ #endif
+@@ -392,6 +393,7 @@ end_element (GMarkupParseContext  *conte
+                 {
+                   g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+ 			       _("Error processing input file with to-pixdata:\n%s"), stderr_child);
++                  g_free (stderr_child);
+                   goto cleanup;
+                 }
+ #endif

Modified: desktop/unstable/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/series?rev=35834&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/series [utf-8] Fri Sep 28 19:34:06 2012
@@ -4,6 +4,7 @@
 04_homedir_env.patch
 05_run-gio-tests-with-a-dbus-session.patch
 10_gdbus_race.patch
+20_glib-compile-resources_leak.patch
 61_glib-compile-binaries-path.patch
 90_gio-modules-multiarch-compat.patch
 91_revert_schema_path_warning.patch