summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--dbus/dbus-connection.c2
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index fe796eb7..c3d79d1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
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
<enchanter at users dot sourceforge dot net>
diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
index 0de5f228..54f0a920 100644
--- 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;
}