2003-03-27 Havoc Pennington <hp@redhat.com>

	* bus/config-loader-libxml.c (bus_config_load): add another error
	check

diff --git a/ChangeLog b/ChangeLog
index d702efa8f8a7f8269596719069a5ee8c785a2498..8981335403a5069e481b74afc525e618d578b8c8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-27  Havoc Pennington  <hp@redhat.com>
+
+       * bus/config-loader-libxml.c (bus_config_load): add another error
+       check
+
 2003-03-26  Anders Carlsson  <andersca@codefactory.se>
 
        * doc/TODO:

diff --git a/bus/config-loader-libxml.c b/bus/config-loader-libxml.c
index 74cfd7dcab096c025d073c15bc65a2032c039f45..250fbd2fb9bc593e77ab16ba32e9914f56e1b21f 100644 (file)
--- a/bus/config-loader-libxml.c
+++ b/bus/config-loader-libxml.c
@@ -78,6 +78,7 @@ bus_config_load (const DBusString *file,
   const char *filename;
   BusConfigParser *parser;
   DBusError tmp_error;
+  int ret;
   
   _DBUS_ASSERT_ERROR_IS_CLEAR (error);
   
@@ -122,7 +123,7 @@ bus_config_load (const DBusString *file,
 
   xmlTextReaderSetErrorHandler (reader, xml_text_reader_error, &tmp_error);
 
-  while (xmlTextReaderRead (reader) == 1)
+  while ((ret = xmlTextReaderRead (reader)) == 1)
     {
       int type;
       
@@ -142,6 +143,14 @@ bus_config_load (const DBusString *file,
        * manually handle stuff like <
        */
     }
+
+  if (ret == -1)
+    {
+      if (!dbus_error_is_set (&tmp_error))
+        dbus_set_error (&tmp_error,
+                        DBUS_ERROR_FAILED,
+                        "Unknown failure loading configuration file");
+    }
   
  reader_out:
   xmlFreeTextReader (reader);