From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Subject: [PATCH v2 3/4] lib/config: move g_key_File_get_string before continue
Date: Sun, 9 Jan 2022 10:38:04 -0400 [thread overview]
Message-ID: <20220109143805.3682660-4-david@tethera.net> (raw)
In-Reply-To: <20220109143805.3682660-1-david@tethera.net>
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
---
lib/config.cc | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/lib/config.cc b/lib/config.cc
index 7a2882de..b9e11a54 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);
--
2.34.1
next prev parent reply other threads:[~2022-01-09 14:38 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-09 14:38 v2 fix leaks in n_d_open_with_config David Bremner
2022-01-09 14:38 ` [PATCH v2 1/4] configure: check for ASAN support David Bremner
2022-01-09 14:38 ` [PATCH v2 2/4] test: add known broken test for memory leaks in open David Bremner
2022-01-09 14:38 ` David Bremner [this message]
2022-01-09 14:38 ` [PATCH v2 4/4] lib/database: delete stemmer on destroy David Bremner
2022-01-22 20:54 ` v2 fix leaks in n_d_open_with_config Austin Ray
2022-01-23 1:24 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220109143805.3682660-4-david@tethera.net \
--to=david@tethera.net \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).