diff options
| author | Jens Granseuer <jensgr@gmx.net> | 2009-09-12 14:41:42 +0200 |
|---|---|---|
| committer | Jens Granseuer <jensgr@gmx.net> | 2009-09-12 14:41:42 +0200 |
| commit | 2638abb2360606e37517513a65932bab125d9068 (patch) | |
| tree | 4acfea9b679b673a8253a19aaa76f3b26fc626d6 | |
| parent | cc0c9ced417935e3f3939094869be05bbcc25e09 (diff) | |
| download | gnome-settings-daemon-2638abb2360606e37517513a65932bab125d9068.tar.gz | |
[xsettings] Validate GConf keys read from the configuration
The xsettings plugin uses user-supplied values as GConf keys.
Validate those keys before actually trying to use them so we
don't cause assertions in GConf. Closes bug #594821.
| -rw-r--r-- | plugins/xsettings/gsd-xsettings-manager.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/xsettings/gsd-xsettings-manager.c b/plugins/xsettings/gsd-xsettings-manager.c index e5a7246a..8aee25b9 100644 --- a/plugins/xsettings/gsd-xsettings-manager.c +++ b/plugins/xsettings/gsd-xsettings-manager.c @@ -719,7 +719,7 @@ get_gtk_modules (GConfClient *client) case GCONF_VALUE_STRING: /* linked to another GConf key of type bool */ key = gconf_value_get_string (v); - if (key != NULL) { + if (key != NULL && gconf_valid_key (key, NULL)) { enabled = gconf_client_get_bool (client, key, NULL); } break; |