diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2017-05-04 15:56:51 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-08 12:18:19 +0900 |
| commit | 2d4dcf210e156153a9c1b11bc60d647d5a327624 (patch) | |
| tree | 4b84d3f7306f9d197b2fca22ad1e020fdcc30c5e /setup.c | |
| parent | da6f847559d8794f25da9f7c090929baebce7751 (diff) | |
| download | git-2d4dcf210e156153a9c1b11bc60d647d5a327624.tar.gz | |
setup_discovered_git_dir(): plug memory leak
The setup_explicit_git_dir() function does not take custody of the string
passed as first parameter; we have to release it if we turned the value of
git_dir into an absolute path.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'setup.c')
| -rw-r--r-- | setup.c | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -703,11 +703,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 *to_free = NULL; + const char *ret; + if (offset != cwd->len && !is_absolute_path(gitdir)) - gitdir = real_pathdup(gitdir, 1); + gitdir = to_free = 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(to_free); + return ret; } /* #16.2, #17.2, #20.2, #21.2, #24, #25, #28, #29 (see t1510) */ |