http-push: prevent format overflow warning with gcc >= 9

carenas · gitster · commit 9dde06de1304 · 2019-05-15T11:03:08.000+09:00
In function 'finish_request',
    inlined from 'process_response' at http-push.c:248:2:
http-push.c:587:4: warning: '%s' directive argument is null [-Wformat-overflow=]
  587 |    fprintf(stderr, "Unable to get pack file %s\n%s",
      |    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  588 |     request-&gt;url, curl_errorstr);
      |     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~

request-&gt;url is needed for the error message if there was a failure
during fetch but was being cleared unnecessarily earlier.

note that the leak is prevented by calling release_request unconditionally
at the end.

Signed-off-by: Carlo Marcelo Arenas Belón &lt;carenas@gmail.com&gt;
Suggested-by: Eric Sunshine &lt;sunshine@sunshineco.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/http-push.c b/http-push.c
@@ -525,8 +525,8 @@ static void finish_request(struct transfer_request *request)
 	if (request->headers != NULL)
 		curl_slist_free_all(request->headers);
 
-	/* URL is reused for MOVE after PUT */
-	if (request->state != RUN_PUT) {
+	/* URL is reused for MOVE after PUT and used during FETCH */
+	if (request->state != RUN_PUT && request->state != RUN_FETCH_PACKED) {
 		FREE_AND_NULL(request->url);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -525,8 +525,8 @@ static void finish_request(struct transfer_request *request)`
`525`	`525`	`if (request->headers != NULL)`
`526`	`526`	`curl_slist_free_all(request->headers);`
`527`	`527`
`528`		`- /* URL is reused for MOVE after PUT */`
`529`		`- if (request->state != RUN_PUT) {`
	`528`	`+ /* URL is reused for MOVE after PUT and used during FETCH */`
	`529`	`+ if (request->state != RUN_PUT && request->state != RUN_FETCH_PACKED) {`
`530`	`530`	`FREE_AND_NULL(request->url);`
`531`	`531`	`}`
`532`	`532`