Changeset 1c674dd664a39c9369914763d636244ba1cfe966

Timestamp:

04/03/10 11:41:26 (3 years ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

866d24baaf48377077b4d8bac26343c7e5e201fc

Parents:

d4bc1d70728baa026221a9c90fe17c2ed25df1fc

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-04-03T11:41:26Z+0300

Message:

daemon: fix&improve error handling in ladish_room_create()

Files:

• daemon/room.c (modified) (6 diffs)

daemon/room.c

@@ -56 +56 @@
   {
     log_error("malloc() failed to allocate struct ladish_room");
-    return false;
+    goto fail;
   }
 
@@ -88 +88 @@
   {
     log_error("strdup() failed for room name");
-    free(room_ptr);
-    return false;
+    goto free_room;
   }
 
   if (!ladish_graph_create(&room_ptr->graph, object_path))
   {
-    free(room_ptr);
-    return false;
+    goto free_name;
   }
 
@@ -102 +100 @@
     if (!ladish_graph_copy(ladish_room_get_graph(template), room_ptr->graph))
     {
-      ladish_graph_destroy(room_ptr->graph, true);
-      free(room_ptr);
-      return false;
+      goto destroy_graph;
     }
   }
@@ -120 +116 @@
     {
       log_error("dbus_object_path_new() failed");
-      ladish_graph_destroy(room_ptr->graph, true);
-      free(room_ptr);
-      return false;
+      goto destroy_graph;
     }
 
@@ -128 +122 @@
     {
       log_error("object_path_register() failed");
-      dbus_object_path_destroy(g_dbus_connection, room_ptr->dbus_object);
-      ladish_graph_destroy(room_ptr->graph, true);
-      free(room_ptr);
-      return false;
+      goto destroy_dbus_object;
     }
 
@@ -143 +134 @@
   *room_handle_ptr = (ladish_room_handle)room_ptr;
   return true;
+
+destroy_dbus_object:
+  dbus_object_path_destroy(g_dbus_connection, room_ptr->dbus_object);
+destroy_graph:
+  ladish_graph_destroy(room_ptr->graph, true);
+free_name:
+  free(room_ptr->name);
+free_room:
+  free(room_ptr);
+fail:
+  return false;
 }