mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'js/exec-path-coverity-workaround'
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:
commit
e8272fd5fb
14
exec_cmd.c
14
exec_cmd.c
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue