rpms/dbus-glib/devel dbus-gproxy-cancel.patch, NONE, 1.1 dbus-glib.spec, 1.31, 1.32

[Daniel Williams]

Author: dcbw

Update of /cvs/extras/rpms/dbus-glib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21819

Modified Files:
	dbus-glib.spec 
Added Files:
	dbus-gproxy-cancel.patch 
Log Message:
* Mon Nov 17 2008 Dan Williams <dcbw at redhat.com> - 0.76-3
- Fix crashes when a tracked service restarts too quickly (fdo #18573)



dbus-gproxy-cancel.patch:

--- NEW FILE dbus-gproxy-cancel.patch ---
diff --git a/dbus/dbus-gproxy.c b/dbus/dbus-gproxy.c
index 36d55f8..949a0a0 100644
--- a/dbus/dbus-gproxy.c
+++ b/dbus/dbus-gproxy.c
@@ -658,8 +658,15 @@ unassociate_proxies (gpointer key, gpointer val, gpointer user_data)
 	{
 	  if (!priv->for_owner)
 	    {
-	      g_assert (priv->associated);
-	      g_assert (priv->name_call == NULL);
+	      /* If a service appeared and then vanished very quickly,
+	       * it's conceivable we have an inflight request for
+	       * GetNameOwner here.  Cancel it.
+	       * https://bugs.freedesktop.org/show_bug.cgi?id=18573
+	       */
+	      if (priv->name_call)
+		dbus_g_proxy_cancel_call (manager->bus_proxy, priv->name_call);
+
+	      priv->name_call = NULL;
 
 	      priv->associated = FALSE;
 	      manager->unassociated_proxies = g_slist_prepend (manager->unassociated_proxies, proxy);


Index: dbus-glib.spec
===================================================================
RCS file: /cvs/extras/rpms/dbus-glib/devel/dbus-glib.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- dbus-glib.spec	31 Jul 2008 16:47:07 -0000	1.31
+++ dbus-glib.spec	17 Nov 2008 22:58:36 -0000	1.32
@@ -8,10 +8,12 @@
 Summary: GLib bindings for D-Bus
 Name: dbus-glib
 Version: 0.76
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/dbus-glib/%{name}-%{version}.tar.gz
 Source1: dbus-bus-introspect.xml
+# https://bugs.freedesktop.org/show_bug.cgi?id=18573
+Patch0: dbus-gproxy-cancel.patch
 # https://bugs.freedesktop.org/show_bug.cgi?id=16114
 Patch7: dbus-glib-0.74-getall-wincaps-to-uscore.patch
 License: AFL and GPLv2+
@@ -64,6 +66,7 @@
 %prep
 %setup -q
 
+%patch0 -p1 -b .gproxy-cancel
 %patch7 -p1 -b .getall-wincaps-to-uscore
 %patch10 -p1 -b .bash-completion
 
@@ -125,6 +128,9 @@
 %endif
 
 %changelog
+* Mon Nov 17 2008 Dan Williams <dcbw at redhat.com> - 0.76-3
+- Fix crashes when a tracked service restarts too quickly (fdo #18573)
+
 * Thu Jul 31 2008 David Zeuthen <davidz at redhat.com> - 0.76-2
 - Add bash completion for dbus-send(1)