[maemo-commits] [maemo-commits] r15262 - in projects/haf/trunk/gconf2: . debian gconf

[From: subversion at stage.maemo.org]

Author: richard
Date: 2008-03-06 10:52:54 +0200 (Thu, 06 Mar 2008)
New Revision: 15262

Modified:
   projects/haf/trunk/gconf2/ChangeLog
   projects/haf/trunk/gconf2/debian/changelog
   projects/haf/trunk/gconf2/gconf/gconf-client.c
Log:
NB#81729

Modified: projects/haf/trunk/gconf2/ChangeLog
===================================================================
--- projects/haf/trunk/gconf2/ChangeLog	2008-03-05 15:10:30 UTC (rev 15261)
+++ projects/haf/trunk/gconf2/ChangeLog	2008-03-06 08:52:54 UTC (rev 15262)
@@ -1,3 +1,9 @@
+2008-03-05  Richard Hult  <richard at imendio.com>
+
+	* gconf/gconf-client.c (remove_key_from_cache_recursively_foreach):
+	Fix crash, not sure why a null entry can be in the cache though so
+	this is more of a workaround, NB#81729.
+
 2007-12-11  Richard Hult  <richard at imendio.com>
 
 	* gconf/gconf-dbus.c: (ensure_dbus_connection),

Modified: projects/haf/trunk/gconf2/debian/changelog
===================================================================
--- projects/haf/trunk/gconf2/debian/changelog	2008-03-05 15:10:30 UTC (rev 15261)
+++ projects/haf/trunk/gconf2/debian/changelog	2008-03-06 08:52:54 UTC (rev 15262)
@@ -1,3 +1,9 @@
+gconf2 (2.16.0-1osso11) unstable; urgency=low
+
+  * Fixes: NB#81729, Dmsessiond crash caused by gconf
+
+ -- Richard Hult <richard at imendio.com>  Fri,  7 Mar 2008 09:41:31 +0100
+
 gconf2 (2.16.0-1osso10) unstable; urgency=low
 
   * Fixes: NB#76693, GConf client library forces application exit if D-BUS

Modified: projects/haf/trunk/gconf2/gconf/gconf-client.c
===================================================================
--- projects/haf/trunk/gconf2/gconf/gconf-client.c	2008-03-05 15:10:30 UTC (rev 15261)
+++ projects/haf/trunk/gconf2/gconf/gconf-client.c	2008-03-06 08:52:54 UTC (rev 15262)
@@ -999,7 +999,11 @@
 {
   if (gconf_key_is_below (cached_key, key) == 0 || strcmp (cached_key, key) == 0)
     {
-      gconf_entry_free (entry);
+      /* Not sure why a null entry would be in the cache, but it happens
+       * sometimes, workaround for now to avoid crashing.
+       */
+      if (entry)
+        gconf_entry_free (entry);
       return TRUE;
     }