From 249796e59ace3c5b1739778d12a7eefb3ed1e2dc Mon Sep 17 00:00:00 2001 From: Kjartan Maraas Date: Sun, 2 Dec 2007 16:34:51 +0000 Subject: =?UTF-8?q?Add=20check=20for=20NULL.=20Patch=20from=20Kimmo=20H?= =?UTF-8?q?=C3=A4m=C3=A4l=C3=A4inen.=20Bug=20#492342.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2007-11-22 Kjartan Maraas * 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 --- ChangeLog | 5 +++++ gconf/gconf-internals.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 93cc746a..7790b168 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-11-22 Kjartan Maraas + + * 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 * 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; } -- cgit v1.2.1