2005-06-16 Colin Walters <walters@verbum.org>

	* bus/bus.c (bus_context_new): Set parser to NULL
	after we unref it (Patch from Chris Boscolo, #2174).

diff --git a/ChangeLog b/ChangeLog
index 51f1b578d9f422a612fb71f6c0025f1f44c30de7..2dd32ad9b3939e11e14ef1eaed674ca3017cd247 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-16  Colin Walters  <walters@verbum.org>
+
+       * bus/bus.c (bus_context_new): Set parser to NULL
+       after we unref it (Patch from Chris Boscolo, #2174).
+       
 2005-06-16  Colin Walters  <walters@verbum.org>
 
        * python/dbus_bindings.pyx.in: Import size_t,

diff --git a/bus/bus.c b/bus/bus.c
index 6da13e480f5ea4ce2b09fa73f359d03500f42852..de880cfe53f9533e943e36d3dab43a6d72fd0529 100644 (file)
--- a/bus/bus.c
+++ b/bus/bus.c
@@ -732,7 +732,10 @@ bus_context_new (const DBusString *config_file,
     }
 
   if (parser != NULL)
-    bus_config_parser_unref (parser);
+    {
+      bus_config_parser_unref (parser);
+      parser = NULL;
+    }
   
   /* Here we change our credentials if required,
    * as soon as we've set up our sockets and pidfile