diff options
| author | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2013-09-09 11:25:12 +0300 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2013-09-12 08:22:47 -0700 |
| commit | 6536eacf79f14243d62613be992f2c78f7f2d4e4 (patch) | |
| tree | 81905ae4f23307b8e04963f723130434ae9dd1f8 | |
| parent | 3b321a694255c392003ad645f5ef1f6b9cab2d2f (diff) | |
| download | mmsd-6536eacf79f14243d62613be992f2c78f7f2d4e4.tar.gz | |
gdbus/watch: Fix crash when disconnecting from D-Bus
When disconnecting from D-Bus a message could be recieved with no sender:
Invalid read of size 1
at 0x4A09EE1: strcmp (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
by 0x3B03C386B8: g_str_equal (in /usr/lib64/libglib-2.0.so.0.3600.3)
by 0x4065D6: message_filter (watch.c:529)
by 0x3B0700F9E5: dbus_connection_dispatch (in /usr/lib64/libdbus-1.so.3.7.4)
by 0x4052E7: message_dispatch (mainloop.c:76)
by 0x3B03C48962: ??? (in /usr/lib64/libglib-2.0.so.0.3600.3)
by 0x3B03C47E05: g_main_context_dispatch (in /usr/lib64/libglib-2.0.so.0.3600.3)
by 0x3B03C48157: ??? (in /usr/lib64/libglib-2.0.so.0.3600.3)
by 0x3B03C48559: g_main_loop_run (in /usr/lib64/libglib-2.0.so.0.3600.3)
by 0x4038C5: client_proxy_removed (test-gdbus-client.c:902)
by 0x3B03C6B566: ??? (in /usr/lib64/libglib-2.0.so.0.3600.3)
by 0x3B03C6B6E5: ??? (in /usr/lib64/libglib-2.0.so.0.3600.3)
Address 0x0 is not stack'd, malloc'd or (recently) free'd
| -rw-r--r-- | gdbus/watch.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gdbus/watch.c b/gdbus/watch.c index 27720e0..0f99f4f 100644 --- a/gdbus/watch.c +++ b/gdbus/watch.c @@ -519,6 +519,8 @@ static DBusHandlerResult message_filter(DBusConnection *connection, dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &arg, DBUS_TYPE_INVALID); /* Sender is always the owner */ + if (sender == NULL) + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; for (current = listeners; current != NULL; current = current->next) { data = current->data; |