2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 51f1b578..2dd32ad9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 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,
 	__int64_t, __uint64_t, and __signed.
 
diff --git a/bus/bus.c b/bus/bus.c
index 6da13e48..de880cfe 100644
--- 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