squash! bus/containers: Build a global data structure for container i…

…nstances --- Use _DBUS_STRING_INIT_INVALID to simplify cleanup
smcv · Nov 21, 2017 · 0fc58ba · 0fc58ba · pwithnall · Dec 5, 2017
1 parent 1aa0929
commit 0fc58ba
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/bus/containers.c b/bus/containers.c
@@ -141,7 +141,7 @@ bus_container_instance_new (BusContext *context,
                             DBusError *error)
 {
   BusContainerInstance *self = NULL;
-  DBusString path;
+  DBusString path = _DBUS_STRING_INIT_INVALID;
 
   _dbus_assert (context != NULL);
   _dbus_assert (containers != NULL);
@@ -150,7 +150,7 @@ bus_container_instance_new (BusContext *context,
   if (!_dbus_string_init (&path))
     {
       BUS_SET_OOM (error);
-      return NULL;
+      goto fail;
     }
 
   self = dbus_new0 (BusContainerInstance, 1);