From: Deepika Aggarwal <deepika.a@samsung.com>
Date: Mon, 7 Dec 2015 11:26:06 +0000 (+0530)
Subject: bus: reassure static analysis tool that server slot allocation can't fail
X-Git-Tag: dbus-1.11.4~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=187ae737ec3319383cfe5e6282d1c7e0b9550dcc;p=thirdparty%2Fdbus.git

bus: reassure static analysis tool that server slot allocation can't fail

The NULL-dereference is not actually possible in this case, because we
know that the allocation and setup were done previously.

Signed-off-by: Deepika Aggarwal <deepika.a@samsung.com>
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=93210
---

diff --git a/bus/bus.c b/bus/bus.c
index fd4ab9e45..9f1daa2eb 100644
--- a/bus/bus.c
+++ b/bus/bus.c
@@ -90,19 +90,15 @@ server_get_context (DBusServer *server)
   BusContext *context;
   BusServerData *bd;
 
-  if (!dbus_server_allocate_data_slot (&server_data_slot))
-    return NULL;
+  /* this data slot was allocated by the BusContext */
+  _dbus_assert (server_data_slot >= 0);
 
   bd = BUS_SERVER_DATA (server);
-  if (bd == NULL)
-    {
-      dbus_server_free_data_slot (&server_data_slot);
-      return NULL;
-    }
 
-  context = bd->context;
+  /* every DBusServer in the dbus-daemon has gone through setup_server() */
+  _dbus_assert (bd != NULL);
 
-  dbus_server_free_data_slot (&server_data_slot);
+  context = bd->context;
 
   return context;
 }