diff options
| author | John (J5) Palmieri <johnp@redhat.com> | 2008-01-15 15:23:57 -0500 |
|---|---|---|
| committer | John (J5) Palmieri <johnp@redhat.com> | 2008-01-15 15:23:57 -0500 |
| commit | 1b6460201732b21249be1c4fef9722809661a842 (patch) | |
| tree | d53837df6b4ebbdd8905c446191287b7e9e7ee58 | |
| parent | f44e25911053b5ecff67151053bc57baac573cfb (diff) | |
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)
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | dbus/dbus-connection.c | 2 |
2 files changed, 7 insertions, 2 deletions
@@ -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; } |