r35772 - in /desktop/unstable/glib2.0/debian: changelog patches/10_gdbus_race.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Sep 22 15:59:44 2012
New Revision: 35772

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35772
Log:
* New upstream bugfix release.
* 10_gdbus_race.patch: stolen from upstream git. Fix a race condition 
  that would make gnome-shell crash on startup under some conditions.

Added:
    desktop/unstable/glib2.0/debian/patches/10_gdbus_race.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=35772&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog [utf-8] Sat Sep 22 15:59:44 2012
@@ -1,3 +1,11 @@
+glib2.0 (2.33.12+really2.32.4-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+  * 10_gdbus_race.patch: stolen from upstream git. Fix a race condition 
+    that would make gnome-shell crash on startup under some conditions.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 22 Sep 2012 17:59:34 +0200
+
 glib2.0 (2.33.12+really2.32.3-2) unstable; urgency=low
 
   * Explicitly set the shlibs version to 2.32.3 to not generate overly strict

Added: desktop/unstable/glib2.0/debian/patches/10_gdbus_race.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/10_gdbus_race.patch?rev=35772&op=file
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/10_gdbus_race.patch (added)
+++ desktop/unstable/glib2.0/debian/patches/10_gdbus_race.patch [utf-8] Sat Sep 22 15:59:44 2012
@@ -1,0 +1,35 @@
+From 151b198b93764ac69b5c067afe9fbf7c6c4acea4 Mon Sep 17 00:00:00 2001
+From: Pavel Vasin <rat4vier at gmail.com>
+Date: Mon, 16 Jul 2012 11:57:26 +0000
+Subject: GDBusActionGroup: hold ref until async init done
+
+to avoid use-after-free if GDBusActionGroup was finalized
+
+https://bugzilla.gnome.org/show_bug.cgi?id=679509
+---
+(limited to 'gio/gdbusactiongroup.c')
+
+diff --git a/gio/gdbusactiongroup.c b/gio/gdbusactiongroup.c
+index 6c55454..b1c7649 100644
+--- a/gio/gdbusactiongroup.c
++++ b/gio/gdbusactiongroup.c
+@@ -268,6 +268,8 @@ g_dbus_action_group_describe_all_done (GObject      *source,
+       g_variant_iter_free (iter);
+       g_variant_unref (reply);
+     }
++
++  g_object_unref (group);
+ }
+ 
+ 
+@@ -283,7 +285,7 @@ g_dbus_action_group_async_init (GDBusActionGroup *group)
+ 
+   g_dbus_connection_call (group->connection, group->bus_name, group->object_path, "org.gtk.Actions", "DescribeAll", NULL,
+                           G_VARIANT_TYPE ("(a{s(bgav)})"), G_DBUS_CALL_FLAGS_NONE, -1, NULL,
+-                          g_dbus_action_group_describe_all_done, group);
++                          g_dbus_action_group_describe_all_done, g_object_ref (group));
+ }
+ 
+ static gchar **
+--
+cgit v0.9.0.2

Modified: desktop/unstable/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/series?rev=35772&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/series [utf-8] Sat Sep 22 15:59:44 2012
@@ -3,6 +3,7 @@
 03_revert_git_single_include_error.patch
 04_homedir_env.patch
 05_run-gio-tests-with-a-dbus-session.patch
+10_gdbus_race.patch
 61_glib-compile-binaries-path.patch
 90_gio-modules-multiarch-compat.patch
 91_revert_schema_path_warning.patch