unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Cc: David Bremner <david@tethera.net>
Subject: [PATCH 2/4] lib/open: free value from g_key_file_get_value
Date: Sat,  6 Mar 2021 09:49:32 -0400	[thread overview]
Message-ID: <20210306134934.491249-3-david@tethera.net> (raw)
In-Reply-To: <20210306134934.491249-1-david@tethera.net>

This fixes a small memory leak.
---
 lib/open.cc | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/lib/open.cc b/lib/open.cc
index 3b66d2eb..b424fa0c 100644
--- a/lib/open.cc
+++ b/lib/open.cc
@@ -153,7 +153,8 @@ DONE:
 }
 
 static notmuch_status_t
-_choose_database_path (const char *config_path,
+_choose_database_path (void *ctx,
+		       const char *config_path,
 		       const char *profile,
 		       GKeyFile **key_file,
 		       const char **database_path,
@@ -167,8 +168,13 @@ _choose_database_path (const char *config_path,
 	return status;
     }
 
-    if (! *database_path && *key_file)
-	*database_path = g_key_file_get_value (*key_file, "database", "path", NULL);
+    if (! *database_path && *key_file) {
+	char *path  = g_key_file_get_value (*key_file, "database", "path", NULL);
+	if (path) {
+	    *database_path = talloc_strdup (ctx, path);
+	    g_free (path);
+	}
+    }
 
     if (*database_path == NULL) {
 	*message = strdup ("Error: Cannot open a database for a NULL path.\n");
@@ -201,7 +207,7 @@ notmuch_database_open_with_config (const char *database_path,
     GKeyFile *key_file = NULL;
     static int initialized = 0;
 
-    if ((status = _choose_database_path (config_path, profile, &key_file, &database_path, &message)))
+    if ((status = _choose_database_path (local, config_path, profile, &key_file, &database_path, &message)))
 	goto DONE;
 
     if (! (notmuch_path = talloc_asprintf (local, "%s/%s", database_path, ".notmuch"))) {
@@ -425,7 +431,7 @@ notmuch_database_create_with_config (const char *database_path,
     int err;
     void *local = talloc_new (NULL);
 
-    if ((status = _choose_database_path (config_path, profile, &key_file, &database_path, &message)))
+    if ((status = _choose_database_path (local, config_path, profile, &key_file, &database_path, &message)))
 	goto DONE;
 
     err = stat (database_path, &st);
-- 
2.30.1

  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 ` David Bremner [this message]
2021-03-06 13:49 ` [PATCH 3/4] lib/config: free memory from traversing GKeyFile David Bremner
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-3-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).