From: Jiri Denemark <jdenemar@redhat.com>
Date: Mon, 13 Nov 2017 21:22:07 +0000 (+0100)
Subject: vircapstest: Avoid (im)possible strcmp call with NULL argument
X-Git-Tag: v3.10.0-rc1~139
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f244e3161cc5f75932010e38f0ad58f29bef13e;p=thirdparty%2Flibvirt.git

vircapstest: Avoid (im)possible strcmp call with NULL argument

Some compilers may get confused and decide we are calling strcmp with
NULL argument from test_virCapsDomainDataLookupLXC. Although this does
not really happen since the call is guarded with
(data->machinetype != expect_machinetype), using STRNEQ_NULLABLE is
easier to understand, less fragile, and doing so makes sure strcmp is
never called with NULL argument.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---

diff --git a/tests/vircapstest.c b/tests/vircapstest.c
index 95829133d0..05ec802f35 100644
--- a/tests/vircapstest.c
+++ b/tests/vircapstest.c
@@ -188,11 +188,10 @@ doCapsCompare(virCapsPtr caps,
         goto error;
     }
 
-    if (data->machinetype != expect_machinetype &&
-        STRNEQ(data->machinetype, expect_machinetype)) {
+    if (STRNEQ_NULLABLE(data->machinetype, expect_machinetype)) {
         fprintf(stderr, "data->machinetype=%s doesn't match "
                 "expect_machinetype=%s\n",
-                data->machinetype, expect_machinetype);
+                NULLSTR(data->machinetype), NULLSTR(expect_machinetype));
         goto error;
     }