abort and fail if we get an xml error setting up the new_source entries.

2004-06-14  Not Zed  <NotZed@Ximian.com>

        * libedataserver/e-source-group.c
        (e_source_group_new_from_xmldoc): abort and fail if we get an xml
        error setting up the new_source entries.  #59592.

diff --git a/ChangeLog b/ChangeLog
index dac21eb..e67fc58 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-14  Not Zed  <NotZed@Ximian.com>
+
+       * libedataserver/e-source-group.c
+       (e_source_group_new_from_xmldoc): abort and fail if we get an xml
+       error setting up the new_source entries.  #59592.
+
 2004-06-03  JP Rosevear  <jpr@novell.com>
 
        * configure.in: bump version, libtool numbers

diff --git a/libedataserver/e-source-group.c b/libedataserver/e-source-group.c
index 94bbb81..06dc316 100644 (file)
--- a/libedataserver/e-source-group.c
+++ b/libedataserver/e-source-group.c
@@ -247,6 +247,11 @@ e_source_group_new_from_xmldoc (xmlDocPtr doc)
        
        for (p = root->children; p != NULL; p = p->next) {
                ESource *new_source = e_source_new_from_xml_node (p);
+
+               if (new_source == NULL) {
+                       g_object_unref (new);
+                       goto done;
+               }
                e_source_group_add_source (new, new_source, -1);
        }