Skip to content

Commit

Permalink
Merge branch 'js/exec-path-coverity-workaround' into maint
Browse files Browse the repository at this point in the history
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
  • Loading branch information
gitster committed Jan 31, 2017
2 parents 2ae2362 + 007ac54 commit 21a9002
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions exec_cmd.c
Expand Up @@ -64,17 +64,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 *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);
}

return system_path(GIT_EXEC_PATH);
return cached_exec_path;
}

static void add_path(struct strbuf *out, const char *path)
Expand Down

0 comments on commit 21a9002

Please sign in to comment.