diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | gconf/gconf-internals.c | 3 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2007-11-22 Kjartan Maraas <kmaraas@gnome.org> + + * gconf/gconf-internals.c (gconf_key_key): Add check + for NULL. Patch from Kimmo Hämäläinen. Bug #492342. + 2007-11-08 Brian Cameron <brian.cameron@sun.com> * gconf/gconfd.c: Remove calls to gconf_log from signal_handler diff --git a/gconf/gconf-internals.c b/gconf/gconf-internals.c index e5379c2d..e618124b 100644 --- a/gconf/gconf-internals.c +++ b/gconf/gconf-internals.c @@ -118,7 +118,8 @@ gconf_key_key (const gchar* key) end = strrchr(key, '/'); - ++end; + if (end != NULL) + ++end; return end; } |