fix possible crash if pending_return is NULL (FDO Bug #12673)

2008-01-15  John (J5) Palmieri  <johnp@redhat.com>

	* patch by Kimmo Hämäläinen <kimmo dot hamalainen at nokia dot com>

	* dbus/dbus-connection.c (dbus_connection_send_with_reply):
	fix possible crash if pending_return is NULL (FDO Bug #12673)

diff --git a/ChangeLog b/ChangeLog
index fe796eb7b5636afea29b86d9dd07a9322b88a892..c3d79d1b10dbfd4032780d8d2b190e0edc6f76e7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-15  John (J5) Palmieri  <johnp@redhat.com>
+       
+       * patch by Kimmo Hämäläinen <kimmo dot hamalainen at nokia dot com>
+
+       * dbus/dbus-connection.c (dbus_connection_send_with_reply): 
+       fix possible crash if pending_return is NULL (FDO Bug #12673)
+
 2008-01-15  John (J5) Palmieri  <johnp@redhat.com>
 
        * portions of patch submitted by Tim Mooney 

diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
index 0de5f2282d81862b3835379f554158f0a7e7cf7f..54f0a920311ef884a4fca1718ca5d36865348fe8 100644 (file)
--- a/dbus/dbus-connection.c
+++ b/dbus/dbus-connection.c
@@ -3140,8 +3140,6 @@ dbus_connection_send_with_reply (DBusConnection     *connection,
     {
       CONNECTION_UNLOCK (connection);
 
-      *pending_return = NULL;
-
       return TRUE;
     }