From 1b6460201732b21249be1c4fef9722809661a842 Mon Sep 17 00:00:00 2001
From: "John (J5) Palmieri" <johnp@redhat.com>
Date: Tue, 15 Jan 2008 15:23:57 -0500
Subject: [PATCH] fix possible crash if pending_return is NULL (FDO Bug #12673)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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)
---
 ChangeLog              | 7 +++++++
 dbus/dbus-connection.c | 2 --
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fe796eb..c3d79d1 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 0de5f22..54f0a92 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;
     }
 
-- 
2.7.4