diff options
| author | David Bremner <david@tethera.net> | 2022-01-09 10:38:04 -0400 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2022-01-22 21:14:29 -0400 |
| commit | df7c5acd759f22fcb537490f62b85d39aa71d677 (patch) | |
| tree | 0ffaec1d342f1440bbdbcb1debce1d6ac9c17cb0 | |
| parent | 8dab460a082633903a0cf50938378ec12794819e (diff) | |
lib/config: move g_key_File_get_string before continue
In [1] Austin Ray reported some memory leaks in
notmuch_database_open. One of those leaks is caused by jumping to the
next key without freeing val. This change avoids that leak.
[1]: id:20220105224538.m36lnjn7rf3ieonc@athena
| -rw-r--r-- | lib/config.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/config.cc b/lib/config.cc index 003ce679..503a0c8b 100644 --- a/lib/config.cc +++ b/lib/config.cc @@ -435,11 +435,6 @@ _notmuch_config_load_from_file (notmuch_database_t *notmuch, for (gchar **keys_p = keys; *keys_p; keys_p++) { char *absolute_key = talloc_asprintf (notmuch, "%s.%s", *grp, *keys_p); char *normalized_val; - val = g_key_file_get_string (file, *grp, *keys_p, NULL); - if (! val) { - status = NOTMUCH_STATUS_FILE_ERROR; - goto DONE; - } /* If we opened from a given path, do not overwrite it */ if (strcmp (absolute_key, "database.path") == 0 && @@ -447,6 +442,12 @@ _notmuch_config_load_from_file (notmuch_database_t *notmuch, notmuch->xapian_db) continue; + val = g_key_file_get_string (file, *grp, *keys_p, NULL); + if (! val) { + status = NOTMUCH_STATUS_FILE_ERROR; + goto DONE; + } + normalized_val = _expand_path (notmuch, absolute_key, val); _notmuch_string_map_set (notmuch->config, absolute_key, normalized_val); g_free (val); |