]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
conf: Resolve Coverity FORWARD_NULL
authorJohn Ferlan <jferlan@redhat.com>
Wed, 13 May 2015 10:50:48 +0000 (06:50 -0400)
committerJohn Ferlan <jferlan@redhat.com>
Sun, 24 May 2015 11:01:48 +0000 (07:01 -0400)
Even though it's been pointed out they are false positives:

http://www.redhat.com/archives/libvir-list/2015-May/msg00301.html

and

http://www.redhat.com/archives/libvir-list/2015-May/msg00302.html

these still show up as Coverity issues. In order to silence Coverity
add an 'sa_assert' prior to check failure.

Signed-off-by: John Ferlan <jferlan@redhat.com>
src/conf/domain_conf.c

index 631f9ebe034e854b34fea2dfd3b0b08ca0bc6c34..d5207b1207eaa164e46d7af88414d73ba77e0c1c 100644 (file)
@@ -23274,6 +23274,7 @@ virDomainObjListCollect(virDomainObjListPtr domlist,
     struct virDomainListData data = { NULL, 0 };
 
     virObjectLock(domlist);
+    sa_assert(domlist->objs);
     if (VIR_ALLOC_N(data.vms, virHashSize(domlist->objs)) < 0) {
         virObjectUnlock(domlist);
         return -1;
@@ -23336,6 +23337,7 @@ virDomainObjListConvert(virDomainObjListPtr domlist,
     }
     virObjectUnlock(domlist);
 
+    sa_assert(*vms);
     virDomainObjListFilter(vms, nvms, conn, filter, flags);
 
     return 0;