diff options
| author | Szymon Janc <szymon.janc@tieto.com> | 2013-09-26 10:02:34 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2013-10-14 06:06:31 -0700 |
| commit | df8cf542d874f2259b52bc43280641bfb5215658 (patch) | |
| tree | 14f85a40703c9e37a35f7d585009917387aed658 /gdbus | |
| parent | 2158249069ad9f56614e874c36147ba68364913f (diff) | |
| download | ofono-df8cf542d874f2259b52bc43280641bfb5215658.tar.bz2 | |
gdbus: Check for NULL DBusPendingCall in g_dbus_send_message_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."
Check this in g_dbus_send_message_with_reply so that callers don't need
to double check for NULL if g_dbus_send_message_with_reply returned
TRUE.
This also fix crash if passing FD over D-Bus is blocked e.g. by SELinux
policy.
bluetoothd[1894]: profiles/audio/avdtp.c:session_cb()
bluetoothd[1894]: profiles/audio/avdtp.c:avdtp_parse_cmd() Received
SET_CONFIGURATION_CMD
bluetoothd[1894]: profiles/audio/a2dp.c:endpoint_setconf_ind() Source
0x6c5000: Set_Configuration_Ind
bluetoothd[1894]: profiles/audio/avdtp.c:avdtp_ref() 0x6df360: ref=1
bluetoothd[1894]: profiles/audio/a2dp.c:setup_ref() 0x6d32b0: ref=1
process 1894: arguments to dbus_pending_call_set_notify() were incorrect,
assertion "pending != NULL" failed in file dbus-pending-call.c line
636.
This is normally a bug in some application using the D-Bus library.
Diffstat (limited to 'gdbus')
| -rw-r--r-- | gdbus/object.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/gdbus/object.c b/gdbus/object.c index 0822fe88..268fed55 100644 --- a/gdbus/object.c +++ b/gdbus/object.c @@ -1510,11 +1510,20 @@ gboolean g_dbus_send_message_with_reply(DBusConnection *connection, DBusMessage *message, DBusPendingCall **call, int timeout) { + dbus_bool_t ret; + /* Flush pending signal to guarantee message order */ g_dbus_flush(connection); - return dbus_connection_send_with_reply(connection, message, call, + ret = dbus_connection_send_with_reply(connection, message, call, timeout); + + if (ret == TRUE && call != NULL && *call == NULL) { + error("Unable to send message (passing fd blocked?)"); + return FALSE; + } + + return ret; } gboolean g_dbus_send_error_valist(DBusConnection *connection, |