diff options
author | Anderson Lizardo <anderson.lizardo@openbossa.org> | 2013-05-04 15:39:43 -0400 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2013-05-08 10:56:26 +0300 |
commit | 940428c4145591c54744bea3f42856a6deb11e52 (patch) | |
tree | ac08980b933ec9b1169f9384ed28bfce9af7303f /gdbus/client.c | |
parent | 010ed4e4247763b8cd5a07e77cc08bf825c707ac (diff) | |
download | bluez-940428c4145591c54744bea3f42856a6deb11e52.tar.gz |
gdbus: Fix using NULL DBusPendingCall when disconnected from D-Bus
From D-Bus documentation for dbus_connection_send_with_reply():
"Warning: if the connection is disconnected or you try to send Unix file
descriptors on a connection that does not support them, the
DBusPendingCall will be set to NULL, so be careful with this."
Fix these errors when killing D-Bus daemon with the client still
running:
process 5712: arguments to dbus_pending_call_set_notify() were
incorrect, assertion "pending != NULL" failed in file
../../dbus/dbus-pending-call.c line 596.
This is normally a bug in some application using the D-Bus library.
process 5712: arguments to dbus_pending_call_unref() were incorrect,
assertion "pending != NULL" failed in file
../../dbus/dbus-pending-call.c line 572.
This is normally a bug in some application using the D-Bus library.
Diffstat (limited to 'gdbus/client.c')
-rw-r--r-- | gdbus/client.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/gdbus/client.c b/gdbus/client.c index a21b66a14..f700b7ee4 100644 --- a/gdbus/client.c +++ b/gdbus/client.c @@ -105,6 +105,11 @@ static gboolean modify_match(DBusConnection *conn, const char *member, return FALSE; } + if (call == NULL) { + dbus_message_unref(msg); + return FALSE; + } + dbus_pending_call_set_notify(call, modify_match_reply, NULL, NULL); dbus_pending_call_unref(call); |