From: Colin Walters <walters@verbum.org>
Date: Mon, 1 Feb 2010 22:38:25 +0000 (-0500)
Subject: Don't crash when reloading if we haven't loaded user database yet
X-Git-Tag: dbus-1.2.18~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0607bdb676c8fd95126ba994ab72e71becc232d8;p=thirdparty%2Fdbus.git

Don't crash when reloading if we haven't loaded user database yet

The user database is populated on-demand, but the cache dropping
code assumed it had been initialized.  Simply check for NULL.

https://bugs.freedesktop.org/show_bug.cgi?id=26182
---

diff --git a/dbus/dbus-userdb.c b/dbus/dbus-userdb.c
index 5a153c6af..bfa4c4355 100644
--- a/dbus/dbus-userdb.c
+++ b/dbus/dbus-userdb.c
@@ -226,7 +226,8 @@ static DBusString process_homedir;
 static void
 shutdown_system_db (void *data)
 {
-  _dbus_user_database_unref (system_db);
+  if (system_db != NULL)
+    _dbus_user_database_unref (system_db);
   system_db = NULL;
   _dbus_string_free (&process_username);
   _dbus_string_free (&process_homedir);
@@ -345,7 +346,8 @@ _dbus_user_database_flush_system (void)
 {
   _dbus_user_database_lock_system ();
    
-  _dbus_user_database_flush (system_db);
+   if (system_db != NULL)
+    _dbus_user_database_flush (system_db);
 
   _dbus_user_database_unlock_system ();
 }