1 files changed, 5 insertions, 9 deletions

diff --git a/bus/bus.c b/bus/bus.c
index fd4ab9e4..9f1daa2e 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;
 }