[libvirt] [PATCH] 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. --- src/conf/domain_addr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index a756f12..fb4a76f 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; -- 1.8.5.5

On 06/23/14 08:36, Ján Tomko wrote:
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. --- src/conf/domain_addr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
ACK, Peter

On 06/23/2014 08:42 AM, Peter Krempa wrote:
On 06/23/14 08:36, Ján Tomko wrote:
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. --- src/conf/domain_addr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
ACK,
Thanks, pushed. Jan
participants (2)
-
Ján Tomko
-
Peter Krempa