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>

diff --git a/bus/services.c b/bus/services.c
index 6f642a438c6afceeb6a350bdc67619205f01c5a1..a7dd181ebdd4c234c3eda8b64e5730eb26e99d63 100644 (file)
--- 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;