[maemo-commits] [maemo-commits] r15651 - in projects/haf/trunk/dbus-glib/debian: . patches

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2008-06-16 12:20:38 +0300 (Mon, 16 Jun 2008)
New Revision: 15651

Added:
   projects/haf/trunk/dbus-glib/debian/patches/13-zero-call_id-fix.patch
Modified:
   projects/haf/trunk/dbus-glib/debian/changelog
Log:
add patch to avoid a crash in OOM


Modified: projects/haf/trunk/dbus-glib/debian/changelog
===================================================================
--- projects/haf/trunk/dbus-glib/debian/changelog	2008-06-16 07:31:35 UTC (rev 15650)
+++ projects/haf/trunk/dbus-glib/debian/changelog	2008-06-16 09:20:38 UTC (rev 15651)
@@ -1,3 +1,10 @@
+dbus-glib (0.74-0osso6) experimental; urgency=low
+
+  * dbus_g_proxy_call_with_timeout: add check for zero call_id, avoids
+    crash in OOM.  Fixes: NB#86280
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Mon, 16 Jun 2008 12:13:53 +0300
+
 dbus-glib (0.74-0osso5) experimental; urgency=low
 
   * Fix a bug in 08-fix-pending-call-remove.patch. Fixes: NB#79818

Added: projects/haf/trunk/dbus-glib/debian/patches/13-zero-call_id-fix.patch
===================================================================
--- projects/haf/trunk/dbus-glib/debian/patches/13-zero-call_id-fix.patch	2008-06-16 07:31:35 UTC (rev 15650)
+++ projects/haf/trunk/dbus-glib/debian/patches/13-zero-call_id-fix.patch	2008-06-16 09:20:38 UTC (rev 15651)
@@ -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	2008-06-16 09:35:42.000000000 +0300
+@@ -2575,8 +2575,10 @@ dbus_g_proxy_call_with_timeout (DBusGPro
+ 
+   g_value_array_free (in_args);
+ 
+-  first_arg_type = va_arg (args, GType);
+-  ret = dbus_g_proxy_end_call_internal (proxy, call_id, error, first_arg_type, args);
++  if (call_id > 0) {
++    first_arg_type = va_arg (args, GType);
++    ret = dbus_g_proxy_end_call_internal (proxy, call_id, error, first_arg_type, args);
++  }
+ 
+   va_end (args);
+