diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2015-01-08 17:27:58 -0600 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2015-01-08 17:27:58 -0600 |
| commit | aebdbcd95412273a3e0a64b0c9221a0421314915 (patch) | |
| tree | fb87c041f1b458f43af2780e23afc12e6954280d | |
| parent | 1646412d8fc9e1532a194df2515e9a5fde4da988 (diff) | |
| parent | 365d3672382ca514190ef7905d1eadbe44f7381e (diff) | |
| download | libgit2-aebdbcd95412273a3e0a64b0c9221a0421314915.tar.gz | |
Merge pull request #2811 from ethomson/remote_leak
remote: plug leak
| -rw-r--r-- | src/remote.c | 10 | ||||
| -rw-r--r-- | tests/submodule/init.c | 6 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/remote.c b/src/remote.c index c79e58a3c..5ba7735ae 100644 --- a/src/remote.c +++ b/src/remote.c @@ -139,7 +139,7 @@ static int canonicalize_url(git_buf *out, const char *in) static int create_internal(git_remote **out, git_repository *repo, const char *name, const char *url, const char *fetch) { git_remote *remote; - git_config *config; + git_config *config = NULL; git_buf canonical_url = GIT_BUF_INIT, fetchbuf = GIT_BUF_INIT; int error = -1; @@ -183,12 +183,12 @@ static int create_internal(git_remote **out, git_repository *repo, const char *n remote->download_tags = GIT_REMOTE_DOWNLOAD_TAGS_NONE; *out = remote; - git_buf_free(&fetchbuf); - git_buf_free(&canonical_url); - return 0; + error = 0; on_error: - git_remote_free(remote); + if (error) + git_remote_free(remote); + git_config_free(config); git_buf_free(&fetchbuf); git_buf_free(&canonical_url); diff --git a/tests/submodule/init.c b/tests/submodule/init.c index d07bc9a5b..6d4c75c74 100644 --- a/tests/submodule/init.c +++ b/tests/submodule/init.c @@ -41,6 +41,7 @@ void test_submodule_init__absolute_url(void) git_buf_free(&absolute_url); git_config_free(cfg); + git_submodule_free(sm); } void test_submodule_init__relative_url(void) @@ -70,6 +71,7 @@ void test_submodule_init__relative_url(void) git_buf_free(&absolute_url); git_config_free(cfg); + git_submodule_free(sm); } void test_submodule_init__relative_url_detached_head(void) @@ -107,5 +109,7 @@ void test_submodule_init__relative_url_detached_head(void) git_buf_free(&absolute_url); git_config_free(cfg); - + git_commit_free(head_commit); + git_reference_free(head_ref); + git_submodule_free(sm); } |