}
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,
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");
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"))) {
DONE:
talloc_free (local);
+ if (key_file)
+ g_key_file_free (key_file);
+
if (message) {
if (status_string)
*status_string = message;
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);
DONE:
talloc_free (local);
+ if (key_file)
+ g_key_file_free (key_file);
+
if (message) {
if (status_string)
*status_string = message;