undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix various memory leaks in http-push.c and http-walker.c

Browse Source 
Signed-off-by: Mike Hommey <mh@glandium.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Mike Hommey 2007-12-10 22:36:11 +01:00 committed by Junio C Hamano
parent 028c297638
commit 3a462bc9ba
2 changed files with 45 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
http-push.c
View File

@ -1119,6 +1119,7 @@ int fetch_ref(char *ref, unsigned char *sha1)
char *base = remote->url; char *base = remote->url;
struct active_request_slot *slot; struct active_request_slot *slot;
struct slot_results results; struct slot_results results;
int ret;
url = quote_ref_url(base, ref); url = quote_ref_url(base, ref);
slot = get_active_slot(); slot = get_active_slot();
@ -1129,19 +1130,23 @@ int fetch_ref(char *ref, unsigned char *sha1)
curl_easy_setopt(slot->curl, CURLOPT_URL, url); curl_easy_setopt(slot->curl, CURLOPT_URL, url);
if (start_active_slot(slot)) { if (start_active_slot(slot)) {
run_active_slot(slot); run_active_slot(slot);
free(url); if (results.curl_result == CURLE_OK) {
if (results.curl_result != CURLE_OK) strbuf_rtrim(&buffer);
return error("Couldn't get %s for %s\n%s", if (buffer.len == 40)
url, ref, curl_errorstr); ret = get_sha1_hex(buffer.buf, sha1);
else
ret = 1;
} else {
ret = error("Couldn't get %s for %s\n%s",
url, ref, curl_errorstr);
}
} else { } else {
free(url); ret = error("Unable to start request");
return error("Unable to start request");
} }
strbuf_rtrim(&buffer); strbuf_release(&buffer);
if (buffer.len != 40) free(url);
return 1; return ret;
return get_sha1_hex(buffer.buf, sha1);
} }
static void one_remote_object(const char *hex) static void one_remote_object(const char *hex)
@ -2043,6 +2048,7 @@ static int remote_exists(const char *path)
char *url = xmalloc(strlen(remote->url) + strlen(path) + 1); char *url = xmalloc(strlen(remote->url) + strlen(path) + 1);
struct active_request_slot *slot; struct active_request_slot *slot;
struct slot_results results; struct slot_results results;
int ret = -1;
sprintf(url, "%s%s", remote->url, path); sprintf(url, "%s%s", remote->url, path);
@ -2055,9 +2061,9 @@ static int remote_exists(const char *path)
run_active_slot(slot); run_active_slot(slot);
free(url); free(url);
if (results.http_code == 404) if (results.http_code == 404)
return 0; ret = 0;
else if (results.curl_result == CURLE_OK) else if (results.curl_result == CURLE_OK)
return 1; ret = 1;
else else
fprintf(stderr, "HEAD HTTP error %ld\n", results.http_code); fprintf(stderr, "HEAD HTTP error %ld\n", results.http_code);
} else { } else {
@ -2065,7 +2071,8 @@ static int remote_exists(const char *path)
fprintf(stderr, "Unable to start HEAD request\n"); fprintf(stderr, "Unable to start HEAD request\n");
} }
return -1; free(url);
return ret;
} }
static void fetch_symref(const char *path, char **symref, unsigned char *sha1) static void fetch_symref(const char *path, char **symref, unsigned char *sha1)

40
http-walker.c
View File

@ -644,6 +644,7 @@ static int fetch_indices(struct walker *walker, struct alt_base *repo)
struct strbuf buffer = STRBUF_INIT; struct strbuf buffer = STRBUF_INIT;
char *data; char *data;
int i = 0; int i = 0;
int ret = 0;
struct active_request_slot *slot; struct active_request_slot *slot;
struct slot_results results; struct slot_results results;
@ -666,19 +667,19 @@ static int fetch_indices(struct walker *walker, struct alt_base *repo)
if (start_active_slot(slot)) { if (start_active_slot(slot)) {
run_active_slot(slot); run_active_slot(slot);
if (results.curl_result != CURLE_OK) { if (results.curl_result != CURLE_OK) {
strbuf_release(&buffer);
if (missing_target(&results)) { if (missing_target(&results)) {
repo->got_indices = 1; repo->got_indices = 1;
return 0; goto cleanup;
} else { } else {
repo->got_indices = 0; repo->got_indices = 0;
return error("%s", curl_errorstr); ret = error("%s", curl_errorstr);
goto cleanup;
} }
} }
} else { } else {
repo->got_indices = 0; repo->got_indices = 0;
strbuf_release(&buffer); ret = error("Unable to start request");
return error("Unable to start request"); goto cleanup;
} }
data = buffer.buf; data = buffer.buf;
@ -701,9 +702,11 @@ static int fetch_indices(struct walker *walker, struct alt_base *repo)
i++; i++;
} }
strbuf_release(&buffer);
repo->got_indices = 1; repo->got_indices = 1;
return 0; cleanup:
strbuf_release(&buffer);
free(url);
return ret;
} }
static int fetch_pack(struct walker *walker, struct alt_base *repo, unsigned char *sha1) static int fetch_pack(struct walker *walker, struct alt_base *repo, unsigned char *sha1)
@ -939,6 +942,7 @@ static int fetch_ref(struct walker *walker, char *ref, unsigned char *sha1)
const char *base = data->alt->base; const char *base = data->alt->base;
struct active_request_slot *slot; struct active_request_slot *slot;
struct slot_results results; struct slot_results results;
int ret;
url = quote_ref_url(base, ref); url = quote_ref_url(base, ref);
slot = get_active_slot(); slot = get_active_slot();
@ -949,17 +953,23 @@ static int fetch_ref(struct walker *walker, char *ref, unsigned char *sha1)
curl_easy_setopt(slot->curl, CURLOPT_URL, url); curl_easy_setopt(slot->curl, CURLOPT_URL, url);
if (start_active_slot(slot)) { if (start_active_slot(slot)) {
run_active_slot(slot); run_active_slot(slot);
if (results.curl_result != CURLE_OK) if (results.curl_result == CURLE_OK) {
return error("Couldn't get %s for %s\n%s", strbuf_rtrim(&buffer);
url, ref, curl_errorstr); if (buffer.len == 40)
ret = get_sha1_hex(buffer.buf, sha1);
else
ret = 1;
} else {
ret = error("Couldn't get %s for %s\n%s",
url, ref, curl_errorstr);
}
} else { } else {
return error("Unable to start request"); ret = error("Unable to start request");
} }
strbuf_rtrim(&buffer); strbuf_release(&buffer);
if (buffer.len != 40) free(url);
return 1; return ret;
return get_sha1_hex(buffer.buf, sha1);
} }
static void cleanup(struct walker *walker) static void cleanup(struct walker *walker)