From 8484b63c18741307e77c66d830a2bbde26dc834a Mon Sep 17 00:00:00 2001 From: Tanu Kaskinen Date: Tue, 17 Apr 2018 09:07:38 +0300 Subject: gsettings: check that children haven't been deleted before using them According to the documentation of g_settings_list_children(), the listed children may be removed at any time, so g_settings_get_child() may return NULL. This is probably very unlikely to happen in practice, but it's good to check anyway. --- src/modules/gsettings/gsettings-helper.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/modules/gsettings/gsettings-helper.c b/src/modules/gsettings/gsettings-helper.c index 36c1df77e..5d1d210ac 100644 --- a/src/modules/gsettings/gsettings-helper.c +++ b/src/modules/gsettings/gsettings-helper.c @@ -93,8 +93,14 @@ int main(int argc, char *argv[]) { group_names = g_settings_list_children(settings); for (name = group_names; *name; name++) { - g_signal_connect(g_settings_get_child(settings, *name), "changed", - (GCallback) module_group_callback, *name); + GSettings *child = g_settings_get_child(settings, *name); + + /* The child may have been removed between the + * g_settings_list_children() and g_settings_get_child() calls. */ + if (!child) + continue; + + g_signal_connect(child, "changed", (GCallback) module_group_callback, *name); handle_module_group(*name); } -- cgit v1.2.1