From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Tue, 21 Apr 2015 11:16:53 +0000 (+0200)
Subject: bus_registry_new: Assert in case of not valid context parameter to avoid potiental... 
X-Git-Tag: dbus-1.9.18~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d10ac7c57e91435c2eca5817dae51a91ff708f78;p=thirdparty%2Fdbus.git

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
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
---

diff --git a/bus/services.c b/bus/services.c
index 8e625867f..6a4c8848d 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;