summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark McLoughlin <mark@skynet.ie>2005-05-06 11:36:17 +0000
committerMark McLoughlin <markmc@src.gnome.org>2005-05-06 11:36:17 +0000
commit1033594c9b2b643a7b265e83be1c5833313b519f (patch)
treeb7520fb3aa30f05dc2fac39ff4c803139a27888b
parentc5b017784bd3b4265482827819b05f1df3f22913 (diff)
downloadgconf-1033594c9b2b643a7b265e83be1c5833313b519f.tar.gz
Fix for crasher. Based on patch from Josselin Mouette <joss@debian.org> in
2005-05-06 Mark McLoughlin <mark@skynet.ie> Fix for crasher. Based on patch from Josselin Mouette <joss@debian.org> in bug #158917 * gconf/gconfd.c: (gconfd_notify_other_listeners): if the value is unset, create an InvalidVal ConfigValue.
-rw-r--r--ChangeLog8
-rw-r--r--gconf/gconfd.c10
2 files changed, 17 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e6f8ec97..ac767b52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-05-06 Mark McLoughlin <mark@skynet.ie>
+
+ Fix for crasher. Based on patch from Josselin Mouette <joss@debian.org>
+ in bug #158917
+
+ * gconf/gconfd.c: (gconfd_notify_other_listeners): if the
+ value is unset, create an InvalidVal ConfigValue.
+
2005-03-31 Steve Murphy <murf@e-tools.com>
* configure.in: Added "rw" to ALL_LINGUAS.
diff --git a/gconf/gconfd.c b/gconf/gconfd.c
index e9e6b4bf..78fd9e49 100644
--- a/gconf/gconfd.c
+++ b/gconf/gconfd.c
@@ -1148,7 +1148,15 @@ gconfd_notify_other_listeners (GConfDatabase *modified_db,
return;
}
- cvalue = gconf_corba_value_from_gconf_value (value);
+ if (value != NULL)
+ {
+ cvalue = gconf_corba_value_from_gconf_value (value);
+ }
+ else
+ {
+ cvalue = gconf_invalid_corba_value ();
+ }
+
gconf_database_notify_listeners (db,
NULL,
key,