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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-10-04 15:13:41 +0300 (Thu, 04 Oct 2007)
New Revision: 14318

Added:
   projects/haf/trunk/dbus/debian/patches/19-fix-segfault-in-case-of-NULL.patch
Modified:
   projects/haf/trunk/dbus/debian/changelog
Log:
fix possible segfault in dbus_connection_send_with_reply


Modified: projects/haf/trunk/dbus/debian/changelog
===================================================================
--- projects/haf/trunk/dbus/debian/changelog	2007-10-04 11:52:10 UTC (rev 14317)
+++ projects/haf/trunk/dbus/debian/changelog	2007-10-04 12:13:41 UTC (rev 14318)
@@ -1,6 +1,8 @@
 dbus (1.0.2-0osso13~unreleased) experimental; urgency=low
 
   * Added dbus-dbg package. Fixes: NB#70750
+  * Fixed a possible segfault in dbus_connection_send_with_reply when the
+    connection has been disconnected.
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Thu, 27 Sep 2007 12:40:47 +0300
 

Added: projects/haf/trunk/dbus/debian/patches/19-fix-segfault-in-case-of-NULL.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/19-fix-segfault-in-case-of-NULL.patch	2007-10-04 11:52:10 UTC (rev 14317)
+++ projects/haf/trunk/dbus/debian/patches/19-fix-segfault-in-case-of-NULL.patch	2007-10-04 12:13:41 UTC (rev 14318)
@@ -0,0 +1,13 @@
+diff -pur dbus-1.0.2/dbus/dbus-connection.c dbus-1.0.2.new/dbus/dbus-connection.c
+--- dbus-1.0.2/dbus/dbus-connection.c	2006-12-11 21:21:08.000000000 +0200
++++ dbus-1.0.2.new/dbus/dbus-connection.c	2007-10-04 12:35:11.375634880 +0300
+@@ -3057,9 +3057,6 @@ dbus_connection_send_with_reply (DBusCon
+    if (!_dbus_connection_get_is_connected_unlocked (connection))
+     {
+       CONNECTION_UNLOCK (connection);
+-
+-      *pending_return = NULL;
+-
+       return TRUE;
+     }
+