From: Mark Wooding <mdw@distorted.org.uk>
Date: Wed, 1 Feb 2006 11:44:28 +0000 (+0000)
Subject: http-fetch: Fix object list corruption in fill_active_slots().
X-Git-Tag: v1.2.0~57^3~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=09db444fdbf647c95de698d243425a7700b91b2f;p=git.git

http-fetch: Fix object list corruption in fill_active_slots().

In fill_active_slots() -- if we find an object which has already arrived,
say as part of a pack, /don't/ remove it from the list.  It's already been
prefetched and someone will ask for it later.  Just label it as done and
carry blithely on.  (As it was, the code would dereference a freed object
to continue through the list anyway.)

Signed-off-by: Mark Wooding <mdw@distorted.org.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/http-fetch.c b/http-fetch.c
index 72edf28b0..7b1b2a02d 100644
--- a/http-fetch.c
+++ b/http-fetch.c
@@ -311,7 +311,7 @@ void fill_active_slots(void)
 	while (active_requests < max_requests && obj_req != NULL) {
 		if (obj_req->state == WAITING) {
 			if (has_sha1_file(obj_req->sha1))
-				release_object_request(obj_req);
+				obj_req->state = COMPLETE;
 			else
 				start_object_request(obj_req);
 			curl_multi_perform(curlm, &num_transfers);