undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git_exec_path: do not return the result of getenv()

Browse Source 
The result of getenv() is not guaranteed by POSIX to last
beyond another call to getenv(), or setenv(), etc.  We
should duplicate the string before returning to the caller
to avoid any surprises.

We already keep a cached pointer to avoid repeatedly leaking
the result of system_path(). We can use the same pointer
here to avoid allocating and leaking for each call.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2017-01-09 01:00:12 -05:00 committed by Junio C Hamano
parent c9bb5d101c
commit 007ac54401
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
exec_cmd.c
View File

@ -68,20 +68,19 @@ void git_set_argv_exec_path(const char *exec_path)
/* Returns the highest-priority, location to look for git programs. */
const char *git_exec_path(void)
{
const char *env;
static char *system_exec_path;
static char *cached_exec_path;
if (argv_exec_path)
return argv_exec_path;
env = getenv(EXEC_PATH_ENVIRONMENT);
if (env && *env) {
return env;
if (!cached_exec_path) {
const char *env = getenv(EXEC_PATH_ENVIRONMENT);
if (env && *env)
cached_exec_path = xstrdup(env);
else
cached_exec_path = system_path(GIT_EXEC_PATH);
}
if (!system_exec_path)
system_exec_path = system_path(GIT_EXEC_PATH);
return system_exec_path;
return cached_exec_path;
}
static void add_path(struct strbuf *out, const char *path)