From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 27 Sep 2023 08:27:07 +0000 (+0200)
Subject: tool_operate: avoid strlen() -1 on zero length content from file
X-Git-Tag: curl-8_4_0~103
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c50cbac0f01575a929b8fb756e8c71861dcf3397;p=thirdparty%2Fcurl.git

tool_operate: avoid strlen() -1 on zero length content from file

Follow-up to 65b563a96a226649ba12cb1e

Closes #11959
---

diff --git a/src/tool_operate.c b/src/tool_operate.c
index 29249975a4..19d55ba569 100644
--- a/src/tool_operate.c
+++ b/src/tool_operate.c
@@ -749,14 +749,13 @@ static char *ipfs_gateway(void)
   Curl_safefree(gateway_composed_file_path);
 
   if(gateway_file) {
-    char *gateway_buffer = NULL;
+    char *buf = NULL;
 
-    if((PARAM_OK == file2string(&gateway_buffer, gateway_file)) &&
-       gateway_buffer) {
-      bool add_slash = (gateway_buffer[strlen(gateway_buffer) - 1] != '/');
-      gateway = aprintf("%s%s", gateway_buffer, (add_slash) ? "/" : "");
-      Curl_safefree(gateway_buffer);
+    if((PARAM_OK == file2string(&buf, gateway_file)) && buf && *buf) {
+      bool add_slash = (buf[strlen(buf) - 1] != '/');
+      gateway = aprintf("%s%s", buf, (add_slash) ? "/" : "");
     }
+    Curl_safefree(buf);
 
     if(gateway_file)
       fclose(gateway_file);