http-fetch: Abort requests for objects which arrived in packs
In fetch_object, there's a call to release an object request if the object mysteriously arrived, say in a pack. Unfortunately, the fetch attempt for this object might already be in progress, and we'll leak the descriptor. Instead, try to tidy away the request. Signed-off-by: Mark Wooding <mdw@distorted.org.uk> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:

committed by
Junio C Hamano

parent
66f04f38f4
commit
53f313897e
16
http-fetch.c
16
http-fetch.c
@ -773,6 +773,20 @@ static int fetch_pack(struct alt_base *repo, unsigned char *sha1)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void abort_object_request(struct object_request *obj_req)
|
||||||
|
{
|
||||||
|
if (obj_req->local >= 0) {
|
||||||
|
close(obj_req->local);
|
||||||
|
obj_req->local = -1;
|
||||||
|
}
|
||||||
|
unlink(obj_req->tmpfile);
|
||||||
|
if (obj_req->slot) {
|
||||||
|
release_active_slot(obj_req->slot);
|
||||||
|
obj_req->slot = NULL;
|
||||||
|
}
|
||||||
|
release_object_request(obj_req);
|
||||||
|
}
|
||||||
|
|
||||||
static int fetch_object(struct alt_base *repo, unsigned char *sha1)
|
static int fetch_object(struct alt_base *repo, unsigned char *sha1)
|
||||||
{
|
{
|
||||||
char *hex = sha1_to_hex(sha1);
|
char *hex = sha1_to_hex(sha1);
|
||||||
@ -785,7 +799,7 @@ static int fetch_object(struct alt_base *repo, unsigned char *sha1)
|
|||||||
return error("Couldn't find request for %s in the queue", hex);
|
return error("Couldn't find request for %s in the queue", hex);
|
||||||
|
|
||||||
if (has_sha1_file(obj_req->sha1)) {
|
if (has_sha1_file(obj_req->sha1)) {
|
||||||
release_object_request(obj_req);
|
abort_object_request(obj_req);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
18
http.c
18
http.c
@ -420,10 +420,26 @@ void run_active_slot(struct active_request_slot *slot)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
static void finish_active_slot(struct active_request_slot *slot)
|
static void closedown_active_slot(struct active_request_slot *slot)
|
||||||
{
|
{
|
||||||
active_requests--;
|
active_requests--;
|
||||||
slot->in_use = 0;
|
slot->in_use = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
void release_active_slot(struct active_request_slot *slot)
|
||||||
|
{
|
||||||
|
closedown_active_slot(slot);
|
||||||
|
if (slot->curl) {
|
||||||
|
curl_multi_remove_handle(curlm, slot->curl);
|
||||||
|
curl_easy_cleanup(slot->curl);
|
||||||
|
slot->curl = NULL;
|
||||||
|
}
|
||||||
|
fill_active_slots();
|
||||||
|
}
|
||||||
|
|
||||||
|
static void finish_active_slot(struct active_request_slot *slot)
|
||||||
|
{
|
||||||
|
closedown_active_slot(slot);
|
||||||
curl_easy_getinfo(slot->curl, CURLINFO_HTTP_CODE, &slot->http_code);
|
curl_easy_getinfo(slot->curl, CURLINFO_HTTP_CODE, &slot->http_code);
|
||||||
|
|
||||||
/* Store slot results so they can be read after the slot is reused */
|
/* Store slot results so they can be read after the slot is reused */
|
||||||
|
1
http.h
1
http.h
@ -61,6 +61,7 @@ extern struct active_request_slot *get_active_slot(void);
|
|||||||
extern int start_active_slot(struct active_request_slot *slot);
|
extern int start_active_slot(struct active_request_slot *slot);
|
||||||
extern void run_active_slot(struct active_request_slot *slot);
|
extern void run_active_slot(struct active_request_slot *slot);
|
||||||
extern void finish_all_active_slots(void);
|
extern void finish_all_active_slots(void);
|
||||||
|
extern void release_active_slot(struct active_request_slot *slot);
|
||||||
|
|
||||||
#ifdef USE_CURL_MULTI
|
#ifdef USE_CURL_MULTI
|
||||||
extern void fill_active_slots(void);
|
extern void fill_active_slots(void);
|
||||||
|
Reference in New Issue
Block a user