Skip to contentSkip to conversation

http-push: workaround for format overflow warning in gcc >= 9

PATCH In review Carlo Marcelo Arenas Belón 3 participants 3 messages May 10, 2019 – May 13, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 http-push: workaround for format overflow warning in 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);
      |     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
---
 http-push.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
http-push.c +2 -1
index f675a96316..2db553ef38 100644
@@ -585,7 +585,8 @@ static void finish_request(struct transfer_request *request)
 		int fail = 1;
 		if (request->curl_result != CURLE_OK) {
 			fprintf(stderr, "Unable to get pack file %s\n%s",
-				request->url, curl_errorstr);
+				request->url ? request->url : "",
+				curl_errorstr);
 		} else {
 			preq = (struct http_pack_request *)request->userData;
 
Signature · 1 line
2.21.0
#1 lore raw
Quoted 8 lines · Carlo Marcelo Arenas Belón

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);
      |     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~

---

Missing sign-off.

http-push.c static void finish_request(struct transfer_request *request) · line 590

Quoted 9 lines
http-push.c +2 -1
@@ -585,7 +585,8 @@ static void finish_request(struct transfer_request *request)
                int fail = 1;
                if (request->curl_result != CURLE_OK) {
                        fprintf(stderr, "Unable to get pack file %s\n%s",
-                               request->url, curl_errorstr);
+                               request->url ? request->url : "",
+                               curl_errorstr);
                } else {

If I'm reading the code correctly, the conditional and "true" branch of the ternary expression are dead code since 'request->url' will unconditionally be NULL due to the:

    /* URL is reused for MOVE after PUT */
    if (request->state != RUN_PUT) {
        FREE_AND_NULL(request->url);
    }

earlier in the function. If you want to present a meaningful error message here, I could imagine squirreling-away the URL so it can be used in the error message, or re-working the code so that FREE_AND_NULL(request->url) is only done when and if needed.

#2 lore raw
Quoted 16 lines · Eric Sunshine

http-push.c static void finish_request(struct transfer_request *request) · line 590

Quoted 6 lines

if (request->curl_result != CURLE_OK) {
fprintf(stderr, "Unable to get pack file %s\n%s",

http-push.c +2 -1
-                               request->url, curl_errorstr);
+                               request->url ? request->url : "",
+                               curl_errorstr);
                } else {

If I'm reading the code correctly, the conditional and "true" branch of the ternary expression are dead code since 'request->url' will unconditionally be NULL due to the:

    /* URL is reused for MOVE after PUT */
    if (request->state != RUN_PUT) {
        FREE_AND_NULL(request->url);
    }
Quoted 4 lines

earlier in the function. If you want to present a meaningful error message here, I could imagine squirreling-away the URL so it can be used in the error message, or re-working the code so that FREE_AND_NULL(request->url) is only done when and if needed.

That matches my understanding.