]> xenbits.xensource.com Git - libvirt.git/commitdiff
conf: Remove need for a couple of sa_asserts
authorJohn Ferlan <jferlan@redhat.com>
Tue, 1 Sep 2015 11:20:15 +0000 (07:20 -0400)
committerJohn Ferlan <jferlan@redhat.com>
Fri, 4 Sep 2015 19:19:04 +0000 (15:19 -0400)
Remove the need for a couple of sa_asserts.

src/conf/domain_conf.c

index f95190ff839e67043da8f81f95f8a17e18275507..6df1618d75fd29afbc56221c19da98daea0c9f79 100644 (file)
@@ -24067,10 +24067,11 @@ virDomainObjListCollect(virDomainObjListPtr domlist,
                         unsigned int flags)
 {
     struct virDomainListData data = { NULL, 0 };
+    ssize_t hash_size;
 
     virObjectLock(domlist);
-    sa_assert(domlist->objs);
-    if (VIR_ALLOC_N(data.vms, virHashSize(domlist->objs)) < 0) {
+    if ((hash_size = virHashSize(domlist->objs)) < 0 ||
+        (VIR_ALLOC_N(data.vms, hash_size) < 0)) {
         virObjectUnlock(domlist);
         return -1;
     }
@@ -24132,8 +24133,8 @@ virDomainObjListConvert(virDomainObjListPtr domlist,
     }
     virObjectUnlock(domlist);
 
-    sa_assert(*vms);
-    virDomainObjListFilter(vms, nvms, conn, filter, flags);
+    if (*vms)
+        virDomainObjListFilter(vms, nvms, conn, filter, flags);
 
     return 0;