debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 02:48:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib/open: free value from g_key_file_get_value

Browse source 
This fixes a small memory leak.
This commit is contained in:
David Bremner 2021-03-06 09:49:32 -04:00
parent 12301392d4
commit 6d5deb76ca
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/open.cc
View file

@ -153,7 +153,8 @@ _load_key_file (const char *path,
} }
static notmuch_status_t static notmuch_status_t
_choose_database_path (const char *config_path, _choose_database_path (void *ctx,
const char *config_path,
const char *profile, const char *profile,
GKeyFile **key_file, GKeyFile **key_file,
const char **database_path, const char **database_path,
@ -167,8 +168,13 @@ _choose_database_path (const char *config_path,
return status; return status;
} }
if (! *database_path && *key_file) if (! *database_path && *key_file) {
*database_path = g_key_file_get_value (*key_file, "database", "path", NULL); 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) { if (*database_path == NULL) {
*message = strdup ("Error: Cannot open a database for a NULL path.\n"); *message = strdup ("Error: Cannot open a database for a NULL path.\n");
@ -201,7 +207,8 @@ notmuch_database_open_with_config (const char *database_path,
GKeyFile *key_file = NULL; GKeyFile *key_file = NULL;
static int initialized = 0; 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; goto DONE;
if (! (notmuch_path = talloc_asprintf (local, "%s/%s", database_path, ".notmuch"))) { if (! (notmuch_path = talloc_asprintf (local, "%s/%s", database_path, ".notmuch"))) {
@ -427,7 +434,8 @@ notmuch_database_create_with_config (const char *database_path,
int err; int err;
void *local = talloc_new (NULL); 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; goto DONE;
err = stat (database_path, &st); err = stat (database_path, &st);