From af153e8bf98f4820456de502756bdd9fb41128cd Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Tue, 21 Apr 2015 13:16:53 +0200 Subject: [PATCH] bus_registry_new: Assert in case of not valid context parameter to avoid potiental crashes (CID 54764). Because the context parameter is dereferenced several times in related code without a null check, we need to make sure to have a valid context. Reported by Coverity: CID 54764: Dereference after null check (FORWARD_NULL) Bug: https://bugs.freedesktop.org/show_bug.cgi?id=90021 --- bus/services.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bus/services.c b/bus/services.c index 8e62586..6a4c884 100644 --- a/bus/services.c +++ b/bus/services.c @@ -76,6 +76,7 @@ bus_registry_new (BusContext *context) { BusRegistry *registry; + _dbus_assert (context); registry = dbus_new0 (BusRegistry, 1); if (registry == NULL) return NULL; @@ -461,8 +462,7 @@ bus_registry_acquire_service (BusRegistry *registry, } if (!bus_apparmor_allows_acquire_service (connection, - (registry->context ? - bus_context_get_type (registry->context) : NULL), + bus_context_get_type (registry->context), _dbus_string_get_const_data (service_name), error)) goto out; -- 1.8.4.5