diff options
author | Laurence McGlashan <Laurence.McGlashan@mathworks.co.uk> | 2019-09-10 11:14:36 +0100 |
---|---|---|
committer | Laurence McGlashan <Laurence.McGlashan@mathworks.co.uk> | 2019-09-10 11:15:54 +0100 |
commit | b545be3dbf3ff2d2aceff955641efae828ed9853 (patch) | |
tree | 37e8a4980257bb42a4703fc57044e94755c384ad | |
parent | c3a7892f30fea72692fafae0e6ff567e5cb8726c (diff) | |
download | libgit2-b545be3dbf3ff2d2aceff955641efae828ed9853.tar.gz |
open:fix memory leak when passing NULL to git_repository_open_ext
-rw-r--r-- | src/repository.c | 7 | ||||
-rw-r--r-- | tests/repo/open.c | 11 |
2 files changed, 17 insertions, 1 deletions
diff --git a/src/repository.c b/src/repository.c index f9c4ef42a..e1e3ef0af 100644 --- a/src/repository.c +++ b/src/repository.c @@ -812,8 +812,13 @@ int git_repository_open_ext( error = find_repo( &gitdir, &workdir, &gitlink, &commondir, start_path, flags, ceiling_dirs); - if (error < 0 || !repo_ptr) + if (error < 0 || !repo_ptr) { + git_buf_dispose(&gitdir); + git_buf_dispose(&workdir); + git_buf_dispose(&gitlink); + git_buf_dispose(&commondir); return error; + } repo = repository_alloc(); GIT_ERROR_CHECK_ALLOC(repo); diff --git a/tests/repo/open.c b/tests/repo/open.c index edcf93fe1..83b53c4b4 100644 --- a/tests/repo/open.c +++ b/tests/repo/open.c @@ -88,6 +88,17 @@ void test_repo_open__open_with_discover(void) cl_fixture_cleanup("attr"); } +void test_repo_open__check_if_repository(void) +{ + cl_git_sandbox_init("empty_standard_repo"); + + /* Pass NULL for the output parameter to check for but not open the repo */ + cl_git_pass(git_repository_open_ext(NULL, "empty_standard_repo", 0, NULL)); + cl_git_fail(git_repository_open_ext(NULL, "repo_does_not_exist", 0, NULL)); + + cl_fixture_cleanup("empty_standard_repo"); +} + static void make_gitlink_dir(const char *dir, const char *linktext) { git_buf path = GIT_BUF_INIT; |