# [PATCH 03/23] http*: cleanup slot->local after fclose 3 messages from 2009-06-05 to 2009-06-06. Participants: Tay Ray Chuan, Jakub Narebski. Thread: https://gitlist.dev/t/19684 ## Tay Ray Chuan, 2009-06-05 16:01 Subject: [PATCH 03/23] http*: cleanup slot->local after fclose Message-ID: <20090606000133.33101b1e.rctay89@gmail.com> URL: https://gitlist.dev/e/20090606000133.33101b1e.rctay89%40gmail.com ``` Set slot->local to NULL after doing a fclose on the FILE* pointer it points to. This prevents an invalid FILE* pointer from being passed to ftell() in http.c::run_active_slot(). This issue was raised by Clemens Buchacher on 30th May: http://www.spinics.net/lists/git/msg104623.html Signed-off-by: Tay Ray Chuan --- I've made it more clear what issue this patch is fixing. http-push.c | 6 ++++++ http-walker.c | 6 ++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/http-push.c b/http-push.c index e16a0ad..0b12ffe 100644 --- a/http-push.c +++ b/http-push.c @@ -724,9 +724,11 @@ static void finish_request(struct transfer_request *request) struct stat st; struct packed_git *target; struct packed_git **lst; + struct active_request_slot *slot; request->curl_result = request->slot->curl_result; request->http_code = request->slot->http_code; + slot = request->slot; request->slot = NULL; /* Keep locks active */ @@ -823,6 +825,7 @@ static void finish_request(struct transfer_request *request) fclose(request->local_stream); request->local_stream = NULL; + slot->local = NULL; if (!move_temp_to_file(request->tmpfile, request->filename)) { target = (struct packed_git *)request->userData; @@ -1024,17 +1027,20 @@ static int fetch_index(unsigned char *sha1) if (results.curl_result != CURLE_OK) { free(url); fclose(indexfile); + slot->local = NULL; return error("Unable to get pack index %s\n%s", url, curl_errorstr); } } else { free(url); fclose(indexfile); + slot->local = NULL; return error("Unable to start request"); } free(url); fclose(indexfile); + slot->local = NULL; return move_temp_to_file(tmpfile, filename); } diff --git a/http-walker.c b/http-walker.c index 7321ccc..9377851 100644 --- a/http-walker.c +++ b/http-walker.c @@ -418,15 +418,18 @@ static int fetch_index(struct walker *walker, struct alt_base *repo, unsigned ch run_active_slot(slot); if (results.curl_result != CURLE_OK) { fclose(indexfile); + slot->local = NULL; return error("Unable to get pack index %s\n%s", url, curl_errorstr); } } else { fclose(indexfile); + slot->local = NULL; return error("Unable to start request"); } fclose(indexfile); + slot->local = NULL; return move_temp_to_file(tmpfile, filename); } @@ -776,16 +779,19 @@ static int fetch_pack(struct walker *walker, struct alt_base *repo, unsigned cha run_active_slot(slot); if (results.curl_result != CURLE_OK) { fclose(packfile); + slot->local = NULL; return error("Unable to get pack file %s\n%s", url, curl_errorstr); } } else { fclose(packfile); + slot->local = NULL; return error("Unable to start request"); } target->pack_size = ftell(packfile); fclose(packfile); + slot->local = NULL; ret = move_temp_to_file(tmpfile, filename); if (ret) -- 1.6.3.1 ``` ## Jakub Narebski, 2009-06-05 20:43 Subject: Re: [PATCH 03/23] http*: cleanup slot->local after fclose Message-ID: URL: https://gitlist.dev/e/m3vdna5s3d.fsf%40localhost.localdomain In-Reply-To: <20090606000133.33101b1e.rctay89@gmail.com> ``` Tay Ray Chuan writes: > Set slot->local to NULL after doing a fclose on the FILE* pointer it > points to. This prevents an invalid FILE* pointer from being passed to > ftell() in http.c::run_active_slot(). You mean here passing FILE* pointer to a fclosed file to ftell()? > > This issue was raised by Clemens Buchacher on 30th May: Just in case: 30th May 2009? > > http://www.spinics.net/lists/git/msg104623.html > > Signed-off-by: Tay Ray Chuan -- Jakub Narebski Poland ShadeHawk on #git ``` ## Tay Ray Chuan, 2009-06-06 01:15 Subject: Re: [PATCH 03/23] http*: cleanup slot->local after fclose Message-ID: URL: https://gitlist.dev/e/be6fef0d0906051815v7eb6cc65vf00830645bff6489%40mail.gmail.com In-Reply-To: ``` Hi, On Sat, Jun 6, 2009 at 4:43 AM, Jakub Narebski wrote: > You mean here passing FILE* pointer to a fclosed file to ftell()? Ok. > Just in case: 30th May 2009? Yes. -- Cheers, Ray Chuan ```