diff options
| author | Kjartan Maraas <kmaraas@gnome.org> | 2007-12-02 16:34:51 +0000 |
|---|---|---|
| committer | Kjartan Maraas <kmaraas@src.gnome.org> | 2007-12-02 16:34:51 +0000 |
| commit | 249796e59ace3c5b1739778d12a7eefb3ed1e2dc (patch) | |
| tree | dc416f4ad3d5da51e383f24c5c74bc2a148e0fe3 | |
| parent | 097003eead8647d2b10ef2de0874fbeb577c3937 (diff) | |
| download | gconf-249796e59ace3c5b1739778d12a7eefb3ed1e2dc.tar.gz | |
Add check for NULL. Patch from Kimmo Hämäläinen. Bug #492342.
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.
svn path=/trunk/; revision=2496
| -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; } |