git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mark Wooding <mdw@distorted.org.uk>
To: git@vger.kernel.org
Subject: [PATCH 2/9] http-fetch: Fix object list corruption in fill_active_slots().
Date: Wed, 01 Feb 2006 11:44:28 +0000	[thread overview]
Message-ID: <20060201114428.5042.53434.stgit@metalzone.distorted.org.uk> (raw)
In-Reply-To: <20060201112822.5042.41256.stgit@metalzone.distorted.org.uk>

From: Mark Wooding <mdw@distorted.org.uk>

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>
---

 http-fetch.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/http-fetch.c b/http-fetch.c
index 4b1b62d..b1ee836 100644
--- a/http-fetch.c
+++ b/http-fetch.c
@@ -312,7 +312,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);

  parent reply	other threads:[~2006-02-01 11:44 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-02-01 11:28 [PATCH 0/9] http-fetch fixes Mark Wooding
2006-02-01 11:44 ` [PATCH 1/9] http-fetch: Mark slots as `watched' to stop them being reused Mark Wooding
2006-02-01 11:44 ` Mark Wooding [this message]
2006-02-01 11:44 ` [PATCH 3/9] http-fetch: Abort requests for objects which arrived in packs Mark Wooding
2006-02-01 17:12   ` Nick Hengeveld
2006-02-01 17:23     ` Mark Wooding
2006-02-06 23:11       ` Nick Hengeveld
2006-02-01 11:44 ` [PATCH 4/9] http-fetch: Actually watch the file descriptors of interest Mark Wooding
2006-02-01 15:03   ` Nick Hengeveld
2006-02-01 11:44 ` [PATCH 5/9] http-fetch: Fix message reporting rename of object file Mark Wooding
2006-02-01 11:44 ` [PATCH 6/9] http: Turn on verbose Curl messages if GIT_CURL_VERBOSE set in environment Mark Wooding
2006-02-01 11:44 ` [PATCH 7/9] http-fetch: Tidy control flow in process_alternate_response Mark Wooding
2006-02-01 11:44 ` [PATCH 8/9] http: Paranoid sanity checking for active slots Mark Wooding
2006-02-01 11:44 ` [PATCH 9/9] http-fetch: Paranoid sanity checking for the object queue Mark Wooding
2006-02-01 15:30 ` [PATCH 0/9] http-fetch fixes Uwe Zeisberger
2006-02-01 15:47   ` Mark Wooding
2006-02-02  3:02     ` Junio C Hamano
2006-02-03 20:20       ` Mark Wooding
2006-02-03 20:42         ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20060201114428.5042.53434.stgit@metalzone.distorted.org.uk \
    --to=mdw@distorted.org.uk \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).