summaryrefslogtreecommitdiff
path: root/bus
diff options
context:
space:
mode:
authorRalf Habacker <ralf.habacker@freenet.de>2022-03-08 08:48:31 +0100
committerSimon McVittie <smcv@collabora.com>2022-04-21 13:55:15 +0100
commitda36b47af1b27606190e0f9ad27aaa23eb187304 (patch)
treee385ce000258091a07ebcd1d07d67f3aaf7f6eb9 /bus
parent3e8423d2991bc6d7f5b4e54c2513a48c39cd23e8 (diff)
downloaddbus-da36b47af1b27606190e0f9ad27aaa23eb187304.tar.gz
bus: Add assertions to silence compiler warnings
gcc 10.3 warns that link->data might be NULL, which would make new_owner->conn a null pointer dereference. However, we know that we only add valid, non-null BusOwner objects to the list, so that can't happen in reality. Part-of: https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/275 Reviewed-by: Simon McVittie <smcv@collabora.com>
Diffstat (limited to 'bus')
-rw-r--r--bus/services.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/bus/services.c b/bus/services.c
index 6f642a43..a7dd181e 100644
--- a/bus/services.c
+++ b/bus/services.c
@@ -1082,6 +1082,7 @@ bus_service_swap_owner (BusService *service,
_dbus_assert (link != NULL);
link = _dbus_list_get_next_link (&service->owners, link);
_dbus_assert (link != NULL);
+ _dbus_assert (link->data != NULL);
new_owner = (BusOwner *)link->data;
new_owner_conn = new_owner->conn;
@@ -1176,6 +1177,7 @@ bus_service_remove_owner (BusService *service,
_dbus_assert (link != NULL);
link = _dbus_list_get_next_link (&service->owners, link);
_dbus_assert (link != NULL);
+ _dbus_assert (link->data != NULL);
new_owner = (BusOwner *)link->data;
new_owner_conn = new_owner->conn;