From: Alexis La Goutte <alexis.lagoutte@gmail.com>
Date: Thu, 30 Mar 2017 12:14:53 +0000 (+0200)
Subject: gcc7: fix ‘*’ in boolean context, suggest ‘&&’ instead [-Wint-in-bool-context]
X-Git-Tag: curl-7_54_0~71
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=244e0a36bd01ebbbdbf009ca2be6b78f29740277;p=curl

gcc7: fix ‘*’ in boolean context, suggest ‘&&’ instead [-Wint-in-bool-context]

Closes #1371
---

diff --git a/src/tool_cb_hdr.c b/src/tool_cb_hdr.c
index 6e23d1da8..0e13eec50 100644
--- a/src/tool_cb_hdr.c
+++ b/src/tool_cb_hdr.c
@@ -56,7 +56,7 @@ size_t tool_header_cb(char *ptr, size_t size, size_t nmemb, void *userdata)
    * it does not match then it fails with CURLE_WRITE_ERROR. So at this
    * point returning a value different from sz*nmemb indicates failure.
    */
-  size_t failure = (size * nmemb) ? 0 : 1;
+  size_t failure = (size && nmemb) ? 0 : 1;
 
   if(!heads->config)
     return failure;
diff --git a/src/tool_cb_wrt.c b/src/tool_cb_wrt.c
index 5c28a2cf8..6c08943ea 100644
--- a/src/tool_cb_wrt.c
+++ b/src/tool_cb_wrt.c
@@ -84,7 +84,7 @@ size_t tool_write_cb(char *buffer, size_t sz, size_t nmemb, void *userdata)
    * it does not match then it fails with CURLE_WRITE_ERROR. So at this
    * point returning a value different from sz*nmemb indicates failure.
    */
-  const size_t failure = (sz * nmemb) ? 0 : 1;
+  const size_t failure = (sz && nmemb) ? 0 : 1;
 
   if(!config)
     return failure;