[maemo-commits] [maemo-commits] r14519 - in projects/haf/tags/dbus-glib/0.74-0osso2fix/debian: . patches

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-10-19 13:03:07 +0300 (Fri, 19 Oct 2007)
New Revision: 14519

Added:
   projects/haf/tags/dbus-glib/0.74-0osso2fix/debian/patches/09-replace-invalid-assert.patch
Modified:
   projects/haf/tags/dbus-glib/0.74-0osso2fix/debian/changelog
Log:
replace invalid assert


Modified: projects/haf/tags/dbus-glib/0.74-0osso2fix/debian/changelog
===================================================================
--- projects/haf/tags/dbus-glib/0.74-0osso2fix/debian/changelog	2007-10-19 09:59:29 UTC (rev 14518)
+++ projects/haf/tags/dbus-glib/0.74-0osso2fix/debian/changelog	2007-10-19 10:03:07 UTC (rev 14519)
@@ -1,3 +1,10 @@
+dbus-glib (0.74-0osso2fix) experimental; urgency=low
+
+  * Replace invalid assert in dbus_g_proxy_begin_call_internal.
+    Fixes: NB#66881
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Fri, 19 Oct 2007 13:00:33 +0300
+
 dbus-glib (0.74-0osso2) experimental; urgency=low
 
   * Added patch from Dafydd Harries to fix pending call removal.

Added: projects/haf/tags/dbus-glib/0.74-0osso2fix/debian/patches/09-replace-invalid-assert.patch
===================================================================
--- projects/haf/tags/dbus-glib/0.74-0osso2fix/debian/patches/09-replace-invalid-assert.patch	2007-10-19 09:59:29 UTC (rev 14518)
+++ projects/haf/tags/dbus-glib/0.74-0osso2fix/debian/patches/09-replace-invalid-assert.patch	2007-10-19 10:03:07 UTC (rev 14519)
@@ -0,0 +1,16 @@
+diff -pur dbus-glib-0.74/dbus/dbus-gproxy.c dbus-glib-0.74.new/dbus/dbus-gproxy.c
+--- dbus-glib-0.74/dbus/dbus-gproxy.c	2007-04-20 19:36:09.000000000 +0300
++++ dbus-glib-0.74.new/dbus/dbus-gproxy.c	2007-10-04 15:24:56.088323208 +0300
+@@ -2167,7 +2167,11 @@ dbus_g_proxy_begin_call_internal (DBusGP
+                                         timeout))
+     goto oom;
+   dbus_message_unref (message);
+-  g_assert (pending != NULL);
++  if (pending == NULL)
++    {
++      g_error ("Disconnected");
++      return 0;
++    }
+ 
+   call_id = ++priv->call_id_counter;
+