From: Ján Tomko <jtomko@redhat.com>
Date: Mon, 23 Jun 2014 06:31:53 +0000 (+0200)
Subject: Properly check the return value of CCWAddressAsString
X-Git-Tag: v1.2.6-rc1~53
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3fe9d75ab641f5b676845980a0ee7aef8148da9b;p=thirdparty%2Flibvirt.git

Properly check the return value of CCWAddressAsString

It returns NULL on failure. Checking if the negation of it
is less than zero makes no sense. (Found by coverity after moving
the code)

In another case, the return value wasn't checked at all.
---

diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c
index a756f12658..fb4a76fe20 100644
--- a/src/conf/domain_addr.c
+++ b/src/conf/domain_addr.c
@@ -614,7 +614,7 @@ virDomainCCWAddressAssign(virDomainDeviceInfoPtr dev,
             goto cleanup;
         }
     } else if (autoassign && !dev->addr.ccw.assigned) {
-        if (!(addr = virDomainCCWAddressAsString(&addrs->next)) < 0)
+        if (!(addr = virDomainCCWAddressAsString(&addrs->next)))
             goto cleanup;
 
         while (virHashLookup(addrs->defined, addr)) {
@@ -624,7 +624,8 @@ virDomainCCWAddressAssign(virDomainDeviceInfoPtr dev,
                 goto cleanup;
             }
             VIR_FREE(addr);
-            addr = virDomainCCWAddressAsString(&addrs->next);
+            if (!(addr = virDomainCCWAddressAsString(&addrs->next)))
+                goto cleanup;
         }
         dev->addr.ccw = addrs->next;
         dev->addr.ccw.assigned = true;