Commit 2fb9d6de95b7ba430cb2fab0da754a8074fa0c43
2012-05-07T10:04:50
remote: ensure the allocated remote is freed when an error occurs during its loading
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50
diff --git a/src/remote.c b/src/remote.c
index 98c2569..a308414 100644
--- a/src/remote.c
+++ b/src/remote.c
@@ -102,11 +102,15 @@ int git_remote_load(git_remote **out, git_repository *repo, const char *name)
remote->name = git__strdup(name);
GITERR_CHECK_ALLOC(remote->name);
- if (git_vector_init(&remote->refs, 32, NULL) < 0)
- return -1;
+ if (git_vector_init(&remote->refs, 32, NULL) < 0) {
+ error = -1;
+ goto cleanup;
+ }
- if (git_buf_printf(&buf, "remote.%s.url", name) < 0)
- return -1;
+ if (git_buf_printf(&buf, "remote.%s.url", name) < 0) {
+ error = -1;
+ goto cleanup;
+ }
if (git_config_get_string(config, git_buf_cstr(&buf), &val) < 0) {
error = -1;
@@ -118,8 +122,10 @@ int git_remote_load(git_remote **out, git_repository *repo, const char *name)
GITERR_CHECK_ALLOC(remote->url);
git_buf_clear(&buf);
- if (git_buf_printf(&buf, "remote.%s.fetch", name) < 0)
- return -1;
+ if (git_buf_printf(&buf, "remote.%s.fetch", name) < 0) {
+ error = -1;
+ goto cleanup;
+ }
error = parse_remote_refspec(config, &remote->fetch, git_buf_cstr(&buf));
if (error == GIT_ENOTFOUND)
@@ -131,8 +137,10 @@ int git_remote_load(git_remote **out, git_repository *repo, const char *name)
}
git_buf_clear(&buf);
- if (git_buf_printf(&buf, "remote.%s.push", name) < 0)
- return -1;
+ if (git_buf_printf(&buf, "remote.%s.push", name) < 0) {
+ error = -1;
+ goto cleanup;
+ }
error = parse_remote_refspec(config, &remote->push, git_buf_cstr(&buf));
if (error == GIT_ENOTFOUND)