setup_discovered_git_dir(): fix memory leak

Identified by Coverity.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2017-04-18 14:11:24 +02:00
parent 52b6bc73ac
commit 7a8ea2c461

View File

@@ -697,11 +697,16 @@ static const char *setup_discovered_git_dir(const char *gitdir,
/* --work-tree is set without --git-dir; use discovered one */
if (getenv(GIT_WORK_TREE_ENVIRONMENT) || git_work_tree_cfg) {
char *p = NULL;
const char *ret;
if (offset != cwd->len && !is_absolute_path(gitdir))
gitdir = real_pathdup(gitdir, 1);
gitdir = p = real_pathdup(gitdir, 1);
if (chdir(cwd->buf))
die_errno("Could not come back to cwd");
return setup_explicit_git_dir(gitdir, cwd, nongit_ok);
ret = setup_explicit_git_dir(gitdir, cwd, nongit_ok);
free(p);
return ret;
}
/* #16.2, #17.2, #20.2, #21.2, #24, #25, #28, #29 (see t1510) */