luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-20 07:38:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

registrybackend: avoid adding a new child when we return the root

Browse Source
This commit is contained in:
Ignacio Casal Quinteiro
2016-02-05 12:05:02 +01:00
parent 63b0f1087d
commit 19fd89f8db
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gio/gregistrysettingsbackend.c
View File

@@ -627,6 +627,13 @@ registry_cache_get_node_for_key (GNode *root,
/* Ignore preceding / */ /* Ignore preceding / */
component = g_strdup (key_name); component = g_strdup (key_name);
c = strchr (component, '/'); c = strchr (component, '/');
if (c == NULL)
{
g_free (component);
return root;
}
if (c != NULL) if (c != NULL)
*c = 0; *c = 0;
@@ -642,9 +649,7 @@ registry_cache_get_node_for_key (GNode *root,
trace ("get_node_for_key: New node for component '%s'\n", component); trace ("get_node_for_key: New node for component '%s'\n", component);
} }
if (c == NULL) if (*(c + 1) == 0)
result = root;
else if (*(c + 1) == 0)
result = child; result = child;
else if (child != NULL) else if (child != NULL)
result = registry_cache_get_node_for_key_recursive (child, c + 1, result = registry_cache_get_node_for_key_recursive (child, c + 1,