diff options
| author | Daniel P. Berrange <berrange@redhat.com> | 2017-02-22 16:42:45 +0000 |
|---|---|---|
| committer | Cole Robinson <crobinso@redhat.com> | 2017-08-04 15:58:05 -0400 |
| commit | 68b19542ec28b451c761d9cc203c574e35636af9 (patch) | |
| tree | fc4136cfe8ef82d34b61818e4e6b50fb904505f0 | |
| parent | 35a7d5084bf8e92e45c2efb0ec1d3cd1196b550b (diff) | |
| download | libvirt-68b19542ec28b451c761d9cc203c574e35636af9.tar.gz | |
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>
(cherry picked from commit 09db97d3cbf334ea28969f08bac8a2fe4aafda16)
| -rw-r--r-- | src/util/viralloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |