git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 03/23] http*: cleanup slot->local after fclose

From
Tay Ray Chuan <rctay89@gmail.com>
Date
Jun 6, 2009, 08:43 UTC
Message-ID
<20090606164326.164ce1e7.rctay89@gmail.com>
In-Reply-To
<cover.1244277116.git.rctay89@gmail.com>

Set slot->local to NULL after doing a fclose() on the file it points to. This prevents the passing of a FILE* pointer to a fclose()'d file to ftell() in http.c::run_active_slot().

This issue was raised by Clemens Buchacher on 30th May 2009:
  http://www.spinics.net/lists/git/msg104623.html
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
---
 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
Previous: Tay Ray ChuanNext: Tay Ray Chuan
Message 3 of 23 in “t5540-http-push: test fetching of loose objects”
  1. 01/23 t5540-http-push: test fetching of loose objectsTay Ray Chuan, Jun 6, 2009
  2. 02/23 t5540-http-push: test fetching of packed objectsTay Ray Chuan, Jun 6, 2009
  3. 03/23 http*: cleanup slot->local after fcloseTay Ray Chuan, Jun 6, 2009
  4. 04/23 http-push: send out fetch requests on queueTay Ray Chuan, Jun 6, 2009
  5. 05/23 http-push: fix missing "#ifdef USE_CURL_MULTI" around "is_running_queue"Tay Ray Chuan, Jun 6, 2009
  6. 06/23 t5550-http-fetch: test fetching of packed objectsTay Ray Chuan, Jun 6, 2009
  7. 07/23 http-push, http-walker: style fixesTay Ray Chuan, Jun 6, 2009
  8. 08/23 http-walker: verify remote packsTay Ray Chuan, Jun 6, 2009
  9. 09/23 http*: copy string returned by sha1_to_hexTay Ray Chuan, Jun 6, 2009
  10. 10/23 http-push: do not SEGV after fetching a bad pack idx fileTay Ray Chuan, Jun 6, 2009
  11. 11/23 Don't expect verify_pack() callers to set pack_sizeTay Ray Chuan, Jun 6, 2009
  12. 12/23 transport.c::get_refs_via_curl(): do not leak refs_urlTay Ray Chuan, Jun 6, 2009
  13. 13/23 http*: move common variables and macros to http.[ch]Tay Ray Chuan, Jun 6, 2009
  14. 14/23 http: create function end_url_with_slashTay Ray Chuan, Jun 6, 2009
  15. 15/23 http.c: new functions for the http APITay Ray Chuan, Jun 6, 2009
  16. 16/23 transport.c::get_refs_via_curl(): use the new http APITay Ray Chuan, Jun 6, 2009
  17. 17/23 http.c::http_fetch_ref(): use the new http APITay Ray Chuan, Jun 6, 2009
  18. 18/23 http-push.c::remote_exists(): use the new http APITay Ray Chuan, Jun 6, 2009
  19. 19/23 http-push.c::fetch_symref(): use the new http APITay Ray Chuan, Jun 6, 2009
  20. 20/23 http*: add http_get_info_packsTay Ray Chuan, Jun 6, 2009
  21. 21/23 http: use new http API in fetch_index()Tay Ray Chuan, Jun 6, 2009
  22. 22/23 http*: add helper methods for fetching packsTay Ray Chuan, Jun 6, 2009
  23. 23/23 http*: add helper methods for fetching objects (loose)Tay Ray Chuan, Jun 6, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.