debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2025-01-03 15:21:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib/config: free memory from traversing GKeyFile

Browse source 
This fixes a few small memory leaks.
This commit is contained in:
David Bremner 2021-03-06 09:49:33 -04:00
parent 6d5deb76ca
commit 50092a0375
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/config.cc
View file

@ -338,7 +338,7 @@ _notmuch_config_load_from_file (notmuch_database_t *notmuch,
GKeyFile *file) GKeyFile *file)
{ {
notmuch_status_t status = NOTMUCH_STATUS_SUCCESS; notmuch_status_t status = NOTMUCH_STATUS_SUCCESS;
gchar **groups, **keys, *val; gchar **groups = NULL, **keys, *val;
if (notmuch->config == NULL) if (notmuch->config == NULL)
notmuch->config = _notmuch_string_map_create (notmuch); notmuch->config = _notmuch_string_map_create (notmuch);
@ -348,22 +348,29 @@ _notmuch_config_load_from_file (notmuch_database_t *notmuch,
goto DONE; goto DONE;
} }
for (groups = g_key_file_get_groups (file, NULL); *groups; groups++) { groups = g_key_file_get_groups (file, NULL);
for (keys = g_key_file_get_keys (file, *groups, NULL, NULL); *keys; keys++) { for (gchar **grp = groups; *grp; grp++) {
char *absolute_key = talloc_asprintf (notmuch, "%s.%s", *groups, *keys); keys = g_key_file_get_keys (file, *grp, NULL, NULL);
val = g_key_file_get_value (file, *groups, *keys, NULL); for (gchar **keys_p = keys; *keys_p; keys_p++) {
char *absolute_key = talloc_asprintf (notmuch, "%s.%s", *grp, *keys_p);
val = g_key_file_get_value (file, *grp, *keys_p, NULL);
if (! val) { if (! val) {
status = NOTMUCH_STATUS_FILE_ERROR; status = NOTMUCH_STATUS_FILE_ERROR;
goto DONE; goto DONE;
} }
_notmuch_string_map_set (notmuch->config, absolute_key, val); _notmuch_string_map_set (notmuch->config, absolute_key, val);
g_free (val);
talloc_free (absolute_key); talloc_free (absolute_key);
if (status) if (status)
goto DONE; goto DONE;
} }
g_strfreev (keys);
} }
DONE: DONE:
if (groups)
g_strfreev (groups);
return status; return status;
} }