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

Merge branch 'js/exec-path-coverity-workaround'

Browse Source 
Code cleanup.

* js/exec-path-coverity-workaround:
  git_exec_path: do not return the result of getenv()
  git_exec_path: avoid Coverity warning about unfree()d result
This commit is contained in:
Junio C Hamano 2017-01-31 13:14:57 -08:00
commit e8272fd5fb
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
exec_cmd.c
View File

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