From: Anderson Lizardo <anderson.lizardo@openbossa.org>
Date: Sat, 4 May 2013 19:39:43 +0000 (-0400)
Subject: gdbus: Fix using NULL DBusPendingCall when disconnected from D-Bus
X-Git-Tag: 1.13~58
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1c75edf59aeeafd75dd531e076cdbdccd8150bf6;p=platform%2Fupstream%2Fofono.git

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.
---

diff --git a/gdbus/client.c b/gdbus/client.c
index a21b66a1..f700b7ee 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);