tool_writeout: make %{errormsg} blank for no errors

Closes curl#6539
kenh · Jan 28, 2021 · 553f286 · 553f286
1 parent 3611f6a
commit 553f286
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/tool_writeout.c b/src/tool_writeout.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -137,8 +137,9 @@ void ourWriteOut(CURL *curl, struct per_transfer *per, const char *writeinfo,
                 fprintf(stream, "%d", (int)result);
                 break;
               case VAR_ERRORMSG:
-                fputs(per->errorbuffer[0] ? per->errorbuffer :
-                      curl_easy_strerror(result), stream);
+                if(result)
+                  fputs(per->errorbuffer[0] ? per->errorbuffer :
+                        curl_easy_strerror(result), stream);
                 break;
               case VAR_INPUT_URL:
                 if(per->this_url)

diff --git a/tests/data/test1029 b/tests/data/test1029
@@ -50,7 +50,7 @@ Content-Length: 62
 Connection: close
 
 This server reply is for testing a simple Location: following
-http://%HOSTIP:%HTTPPORT/we/want/our/data/10290002.txt?coolsite=yes http://%HOSTIP:%HTTPPORT/we/want/our/1029 0 No error
+http://%HOSTIP:%HTTPPORT/we/want/our/data/10290002.txt?coolsite=yes http://%HOSTIP:%HTTPPORT/we/want/our/1029 0 
 </stdout>
 </verify>
 </testcase>