From: Carlo Marcelo Arenas Belón Date: Tue, 14 May 2019 21:11:17 +0000 (-0700) Subject: http-push: prevent format overflow warning with gcc >= 9 X-Git-Tag: v2.22.0-rc1~4^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9dde06de130463c20f8b603ed3a3ffe10347f2f1;p=thirdparty%2Fgit.git http-push: prevent format overflow warning with gcc >= 9 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->url, curl_errorstr); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ request->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 Suggested-by: Eric Sunshine Signed-off-by: Junio C Hamano --- diff --git a/http-push.c b/http-push.c index b22c7caea0..f56cd91d44 100644 --- 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); }