From: Daniel P. Berrange <berrange@redhat.com>
Date: Wed, 22 Feb 2017 16:42:45 +0000 (+0000)
Subject: Use explicit boolean comparison in OOM check
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=09db97d3cbf334ea28969f08bac8a2fe4aafda16;p=libvirt.git

Use explicit boolean comparison in OOM check

GCC 7 gets upset by

   if (!tmp && (size * count))

warning

  util/viralloc.c: In function 'virReallocN':
  util/viralloc.c:246:23: error: '*' in boolean context, suggest '&&' instead [-Werror=int-in-bool-context]
     if (!tmp && (size * count)) {
                 ~~~~~~^~~~~~~~

Keep it happy by adding != 0 to the right hand expression
so it realizes we really are wanting to treat the result
of the arithmetic expression as a boolean

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---

diff --git a/src/util/viralloc.c b/src/util/viralloc.c
index 812aa5b3f9..81f99d9e1f 100644
--- a/src/util/viralloc.c
+++ b/src/util/viralloc.c
@@ -243,7 +243,7 @@ int virReallocN(void *ptrptr,
         return -1;
     }
     tmp = realloc(*(void**)ptrptr, size * count);
-    if (!tmp && (size * count)) {
+    if (!tmp && ((size * count) != 0)) {
         if (report)
             virReportOOMErrorFull(domcode, filename, funcname, linenr);
         return -1;