debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 12:28:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

notmuch-config: talloc_strdup MAILDIR and NAME environment variables

Browse source 
When defined -- the pointer is soon given to talloc_free() which
expects it to be allocated by talloc.
This commit is contained in:
Tomi Ollila 2014-08-07 18:19:50 +03:00 committed by David Bremner
parent 9f0f30f7de
commit 748798511d
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
notmuch-config.c
View file

@ -324,7 +324,9 @@ notmuch_config_open (void *ctx,
if (notmuch_config_get_database_path (config) == NULL) { if (notmuch_config_get_database_path (config) == NULL) {
char *path = getenv ("MAILDIR"); char *path = getenv ("MAILDIR");
if (! path) if (path)
path = talloc_strdup (config, path);
else
path = talloc_asprintf (config, "%s/mail", path = talloc_asprintf (config, "%s/mail",
getenv ("HOME")); getenv ("HOME"));
notmuch_config_set_database_path (config, path); notmuch_config_set_database_path (config, path);
@ -333,7 +335,9 @@ notmuch_config_open (void *ctx,
if (notmuch_config_get_user_name (config) == NULL) { if (notmuch_config_get_user_name (config) == NULL) {
char *name = getenv ("NAME"); char *name = getenv ("NAME");
if (! name) if (name)
name = talloc_strdup (config, name);
else
name = get_name_from_passwd_file (config); name = get_name_from_passwd_file (config);
notmuch_config_set_user_name (config, name); notmuch_config_set_user_name (config, name);
talloc_free (name); talloc_free (name);