]> xenbits.xensource.com Git - libvirt.git/commitdiff
virnetdev: Resolve Coverity FORWARD_NULL
authorJohn Ferlan <jferlan@redhat.com>
Wed, 29 Oct 2014 22:21:17 +0000 (18:21 -0400)
committerJohn Ferlan <jferlan@redhat.com>
Wed, 29 Oct 2014 22:56:06 +0000 (18:56 -0400)
The complaint is that if cleanup is called when virFileReadAll fails,
then mcast->entries is NULL and could be dereferenced in the clear
function. After following the code some - I saw that the caller to
the function (virNetDevGetMulticastTable) will also call
virNetDevMcastListClear if this function returns -1, so this
isn't necessary, so I removed the call.

src/util/virnetdev.c

index 36e84d7a998ed7e46fcda30333e3cdaa17a370c2..4fea4cb4ef30954d16ec549a77cdb35bb5573a02 100644 (file)
@@ -2200,9 +2200,6 @@ static int virNetDevGetMcastList(const char *ifname,
 
     ret = 0;
  cleanup:
-    if (ret < 0)
-        virNetDevMcastListClear(mcast);
-
     VIR_FREE(entry);
 
     return ret;