mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-07 13:30:03 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gsettings: check that children haven't been deleted before using them

Browse source 
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.
This commit is contained in:
Tanu Kaskinen 2018-04-17 09:07:38 +03:00
parent f5ff5d8bf2
commit 8484b63c18
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/modules/gsettings/gsettings-helper.c
View file

@ -93,8 +93,14 @@ int main(int argc, char *argv[]) {
group_names = g_settings_list_children(settings); group_names = g_settings_list_children(settings);
for (name = group_names; *name; name++) { for (name = group_names; *name; name++) {
g_signal_connect(g_settings_get_child(settings, *name), "changed", GSettings *child = g_settings_get_child(settings, *name);
(GCallback) module_group_callback, *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); handle_module_group(*name);
} }