From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Cc: David Bremner <david@tethera.net>
Subject: [PATCH 3/4] lib/config: free memory from traversing GKeyFile
Date: Sat, 6 Mar 2021 09:49:33 -0400 [thread overview]
Message-ID: <20210306134934.491249-4-david@tethera.net> (raw)
In-Reply-To: <20210306134934.491249-1-david@tethera.net>
This fixes a few small memory leaks.
---
lib/config.cc | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/lib/config.cc b/lib/config.cc
index 948751bc..6ace6e52 100644
--- a/lib/config.cc
+++ b/lib/config.cc
@@ -330,7 +330,7 @@ _notmuch_config_load_from_file (notmuch_database_t *notmuch,
GKeyFile *file)
{
notmuch_status_t status = NOTMUCH_STATUS_SUCCESS;
- gchar **groups, **keys, *val;
+ gchar **groups = NULL, **keys, *val;
if (notmuch->config == NULL)
notmuch->config = _notmuch_string_map_create (notmuch);
@@ -340,22 +340,29 @@ _notmuch_config_load_from_file (notmuch_database_t *notmuch,
goto DONE;
}
- for (groups = g_key_file_get_groups (file, NULL); *groups; groups++) {
- for (keys = g_key_file_get_keys (file, *groups, NULL, NULL); *keys; keys++) {
- char *absolute_key = talloc_asprintf(notmuch, "%s.%s", *groups, *keys);
- val = g_key_file_get_value (file, *groups, *keys, NULL);
+ groups = g_key_file_get_groups (file, NULL);
+ for (gchar **grp=groups; *grp; grp++) {
+ keys = g_key_file_get_keys (file, *grp, NULL, 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) {
status = NOTMUCH_STATUS_FILE_ERROR;
goto DONE;
}
_notmuch_string_map_set (notmuch->config, absolute_key, val);
+ g_free (val);
talloc_free (absolute_key);
if (status)
goto DONE;
}
+ g_strfreev (keys);
}
DONE:
+ if (groups)
+ g_strfreev (groups);
+
return status;
}
--
2.30.1
next prev parent reply other threads:[~2021-03-06 13:50 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-06 13:49 Clean up glib / GKeyFile memory use David Bremner
2021-03-06 13:49 ` [PATCH 1/4] lib/open: use local talloc context in n_d_create_with_config David Bremner
2021-03-06 13:49 ` [PATCH 2/4] lib/open: free value from g_key_file_get_value David Bremner
2021-03-06 13:49 ` David Bremner [this message]
2021-03-06 13:49 ` [PATCH 4/4] lib/open: free GKeyFile David Bremner
2021-03-14 12:53 ` Clean up glib / GKeyFile memory use 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=20210306134934.491249-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).