diff options
| author | Mark Wooding <mdw@distorted.org.uk> | 2006-02-07 10:07:39 +0000 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-07 02:13:02 -0800 |
| commit | 53f313897e37f25e1411a6a7cfa328d642847345 (patch) | |
| tree | 9e4832af9cef9d576af7cd67fe51d54f9662b761 /http-fetch.c | |
| parent | 66f04f38f42024dceb1679fc4d672de3746cf237 (diff) | |
| download | git-53f313897e37f25e1411a6a7cfa328d642847345.tar.gz git-53f313897e37f25e1411a6a7cfa328d642847345.tar.xz | |
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>
Diffstat (limited to 'http-fetch.c')
| -rw-r--r-- | http-fetch.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/http-fetch.c b/http-fetch.c index bddbd6b10..ce3df5f35 100644 --- a/http-fetch.c +++ b/http-fetch.c @@ -773,6 +773,20 @@ static int fetch_pack(struct alt_base *repo, unsigned char *sha1) 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) { 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); if (has_sha1_file(obj_req->sha1)) { - release_object_request(obj_req); + abort_object_request(obj_req); return 0; } |