aboutsummaryrefslogtreecommitdiff
path: root/http.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-10-17 10:29:24 -0700
committerJunio C Hamano <gitster@pobox.com>2012-10-17 10:29:24 -0700
commite98fa647aa5673cc95b6e9be1fdc13c0afa2cb37 (patch)
tree7faa5518cddae461d03c77fdef7f2a58f2c26dac /http.c
parent5a77ff74ba5eaef9acb8ea240cb52dd84b874b7a (diff)
parent188923f0d1c8148415b3173986cd1e21871c947e (diff)
downloadgit-e98fa647aa5673cc95b6e9be1fdc13c0afa2cb37.tar.gz
git-e98fa647aa5673cc95b6e9be1fdc13c0afa2cb37.tar.xz
Merge branch 'jk/maint-http-half-auth-push' into maint
* jk/maint-http-half-auth-push: http: fix segfault in handle_curl_result
Diffstat (limited to 'http.c')
-rw-r--r--http.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/http.c b/http.c
index 345c171c5..df9bb7108 100644
--- a/http.c
+++ b/http.c
@@ -745,10 +745,9 @@ char *get_remote_object_url(const char *url, const char *hex,
return strbuf_detach(&buf, NULL);
}
-int handle_curl_result(struct active_request_slot *slot)
+int handle_curl_result(struct active_request_slot *slot,
+ struct slot_results *results)
{
- struct slot_results *results = slot->results;
-
if (results->curl_result == CURLE_OK) {
credential_approve(&http_auth);
return HTTP_OK;
@@ -822,7 +821,7 @@ static int http_request(const char *url, void *result, int target, int options)
if (start_active_slot(slot)) {
run_active_slot(slot);
- ret = handle_curl_result(slot);
+ ret = handle_curl_result(slot, &results);
} else {
error("Unable to start HTTP request for %s", url);
ret = HTTP_START_FAILED;