summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark McLoughlin <mark@skynet.ie>2005-05-06 12:43:56 +0000
committerMark McLoughlin <markmc@src.gnome.org>2005-05-06 12:43:56 +0000
commit138f1c667c60c35ff782369cf4073657dc31f7f1 (patch)
tree815605acf7e77bf23317a2627a8ee810fecb31b7
parent1033594c9b2b643a7b265e83be1c5833313b519f (diff)
downloadgconf-138f1c667c60c35ff782369cf4073657dc31f7f1.tar.gz
Small fix for previous commit.
2005-05-06 Mark McLoughlin <mark@skynet.ie> Small fix for previous commit. * gconf/gconfd.c: (gconfd_notify_other_listeners): Don't try and free a NULL GConfValue.
-rw-r--r--ChangeLog7
-rw-r--r--gconf/gconfd.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ac767b52..8b5d0e79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2005-05-06 Mark McLoughlin <mark@skynet.ie>
+ Small fix for previous commit.
+
+ * gconf/gconfd.c: (gconfd_notify_other_listeners):
+ Don't try and free a NULL GConfValue.
+
+2005-05-06 Mark McLoughlin <mark@skynet.ie>
+
Fix for crasher. Based on patch from Josselin Mouette <joss@debian.org>
in bug #158917
diff --git a/gconf/gconfd.c b/gconf/gconfd.c
index 78fd9e49..ad65fa09 100644
--- a/gconf/gconfd.c
+++ b/gconf/gconfd.c
@@ -1151,6 +1151,7 @@ gconfd_notify_other_listeners (GConfDatabase *modified_db,
if (value != NULL)
{
cvalue = gconf_corba_value_from_gconf_value (value);
+ gconf_value_free (value);
}
else
{
@@ -1165,7 +1166,6 @@ gconfd_notify_other_listeners (GConfDatabase *modified_db,
is_writable,
FALSE);
CORBA_free (cvalue);
- gconf_value_free (value);
}
tmp2 = tmp2->next;