[dia/dia-0-97] Bug 616609 - Don't crash on files with empty groups

[Hans Breuer <hans src gnome org>]

commit ced72db45f158068b27d9884145458540e687a5f
Author: Hans Breuer <hans breuer org>
Date:   Sat May 15 21:47:17 2010 +0200

    Bug 616609 - Don't crash on files with empty groups
    
    Make the code conform to the comment /* don't create empty groups */.
    Otherwise later operations will crash on these.
    (cherry picked from commit 50b5d9192af8bb6431aa61e0aad51929ce9a9604)

 app/load_save.c |   75 +++++++++++++++++++++++++++++-------------------------
 1 files changed, 40 insertions(+), 35 deletions(-)
---
diff --git a/app/load_save.c b/app/load_save.c
index 6256524..2ddd8e2 100644
--- a/app/load_save.c
+++ b/app/load_save.c
@@ -188,46 +188,51 @@ read_objects(xmlNodePtr objects,
     } else if (xmlStrcmp(obj_node->name, (const xmlChar *)"group")==0
                && obj_node->children) {
       /* don't create empty groups */
-      obj = group_create(read_objects(obj_node, objects_hash, filename, NULL, unknown_objects_hash));
+      GList *inner_objects = read_objects(obj_node, objects_hash, filename, NULL, unknown_objects_hash);
+
+      if (inner_objects) {
+        obj = group_create(inner_objects);
+
 #ifdef USE_NEWGROUP
-      /* Old group objects had objects recursively inside them.  Since
-       * objects are now done with parenting, we need to extract those objects,
-       * make a newgroup object, set parent-child relationships, and add
-       * all of them to the diagram.
-       */
-      {
-	DiaObject *newgroup;
-	GList *objects;
-	Point lower_right;
-	type = object_get_type("Misc - NewGroup");
-	lower_right = obj->position;
-	newgroup = type->ops->create(&lower_right,
-				     NULL,
-				     NULL,
-				     NULL);
-	list = g_list_append(list, newgroup);
-	
-	for (objects = group_objects(obj); objects != NULL; objects = g_list_next(objects)) {
-	  DiaObject *subobj = (DiaObject *) objects->data;
-	  list = g_list_append(list, subobj);
-	  subobj->parent = newgroup;
-          newgroup->children = g_list_append(newgroup->children, subobj);
-	  if (subobj->bounding_box.right > lower_right.x) {
-	    lower_right.x = subobj->bounding_box.right;
-	  }
-	  if (subobj->bounding_box.bottom > lower_right.y) {
-	    lower_right.y = subobj->bounding_box.bottom;
+	/* Old group objects had objects recursively inside them.  Since
+	 * objects are now done with parenting, we need to extract those objects,
+	 * make a newgroup object, set parent-child relationships, and add
+	 * all of them to the diagram.
+	 */
+	{
+	  DiaObject *newgroup;
+	  GList *objects;
+	  Point lower_right;
+	  type = object_get_type("Misc - NewGroup");
+	  lower_right = obj->position;
+	  newgroup = type->ops->create(&lower_right,
+				       NULL,
+				       NULL,
+				       NULL);
+	  list = g_list_append(list, newgroup);
+	  
+	  for (objects = group_objects(obj); objects != NULL; objects = g_list_next(objects)) {
+	    DiaObject *subobj = (DiaObject *) objects->data;
+	    list = g_list_append(list, subobj);
+	    subobj->parent = newgroup;
+	    newgroup->children = g_list_append(newgroup->children, subobj);
+	    if (subobj->bounding_box.right > lower_right.x) {
+	      lower_right.x = subobj->bounding_box.right;
+	    }
+	    if (subobj->bounding_box.bottom > lower_right.y) {
+	      lower_right.y = subobj->bounding_box.bottom;
+	    }
 	  }
+	  newgroup->ops->move_handle(newgroup, newgroup->handles[7],
+				 &lower_right, NULL,
+				 HANDLE_MOVE_CREATE_FINAL, 0);
+	  /* We've used the info from the old group, destroy it */
+	  group_destroy_shallow(obj);
 	}
-	newgroup->ops->move_handle(newgroup, newgroup->handles[7],
-			       &lower_right, NULL,
-			       HANDLE_MOVE_CREATE_FINAL, 0);
-	/* We've used the info from the old group, destroy it */
-	group_destroy_shallow(obj);
-      }
 #else
-      list = g_list_append(list, obj);
+	list = g_list_append(list, obj);
 #endif
+      }
     } else {
       /* silently ignore other nodes */
     }