Commit 68206c54bf98f36725d21e7f7efee9f3af68d259
2012-10-13T21:00:45
test: fix some memory leaks
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 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86
diff --git a/src/fetch.c b/src/fetch.c
index f9cc8aa..737a1b4 100644
--- a/src/fetch.c
+++ b/src/fetch.c
@@ -58,10 +58,11 @@ static int filter_wants(git_remote *remote)
{
struct filter_payload p;
git_refspec tagspec;
+ int error = -1;
git_vector_clear(&remote->refs);
if (git_refspec__parse(&tagspec, GIT_REFSPEC_TAGS, true) < 0)
- return -1;
+ return error;
/*
* The fetch refspec can be NULL, and what this means is that the
@@ -75,9 +76,14 @@ static int filter_wants(git_remote *remote)
p.remote = remote;
if (git_repository_odb__weakptr(&p.odb, remote->repo) < 0)
- return -1;
+ goto cleanup;
+
+ error = git_remote_ls(remote, filter_ref__cb, &p);
+
+cleanup:
+ git_refspec__free(&tagspec);
- return git_remote_ls(remote, filter_ref__cb, &p);
+ return error;
}
/* Wait until we get an ack from the */
diff --git a/src/transports/http.c b/src/transports/http.c
index 7b77c92..93dd0c3 100644
--- a/src/transports/http.c
+++ b/src/transports/http.c
@@ -93,6 +93,7 @@ static int send_request(transport_http *t, const char *service, void *data, ssiz
#ifndef GIT_WINHTTP
git_buf request = GIT_BUF_INIT;
const char *verb;
+ int error = -1;
verb = ls ? "GET" : "POST";
/* Generate and send the HTTP request */
@@ -102,17 +103,20 @@ static int send_request(transport_http *t, const char *service, void *data, ssiz
}
- if (gitno_send((git_transport *) t, request.ptr, request.size, 0) < 0) {
- git_buf_free(&request);
- return -1;
- }
+ if (gitno_send((git_transport *) t, request.ptr, request.size, 0) < 0)
+ goto cleanup;
if (content_length) {
if (gitno_send((git_transport *) t, data, content_length, 0) < 0)
- return -1;
+ goto cleanup;
}
- return 0;
+ error = 0;
+
+cleanup:
+ git_buf_free(&request);
+ return error;
+
#else
wchar_t *verb;
wchar_t url[GIT_WIN_PATH], ct[GIT_WIN_PATH];
diff --git a/tests-clar/network/fetch.c b/tests-clar/network/fetch.c
index 63be3de..5ff7b0a 100644
--- a/tests-clar/network/fetch.c
+++ b/tests-clar/network/fetch.c
@@ -47,6 +47,8 @@ static void do_fetch(const char *url, int flag, int n)
git_remote_disconnect(remote);
cl_git_pass(git_remote_update_tips(remote));
cl_assert_equal_i(counter, n);
+
+ git_remote_free(remote);
}
void test_network_fetch__default_git(void)