]> xenbits.xensource.com Git - libvirt.git/commitdiff
migration: check dconnuri in p2p mode
authorNikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Fri, 2 Oct 2015 07:52:52 +0000 (10:52 +0300)
committerJiri Denemark <jdenemar@redhat.com>
Mon, 12 Oct 2015 11:31:36 +0000 (13:31 +0200)
Check dconnuri is not null or we will catch nullpointer later.
I hope this makes Coverity happy.

Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
src/libvirt-domain.c

index fe89d8cd8977bb82d2cb2def10a6171016525342..e6c8604e47c690858f6f7854c70b035c0d2eac96 100644 (file)
@@ -4398,7 +4398,9 @@ virDomainMigrateToURI2(virDomainPtr domain,
     if (virDomainMigrateUnmanagedCheckCompat(domain, flags) < 0)
         goto error;
 
-    if (!(flags & VIR_MIGRATE_PEER2PEER))
+    if (flags & VIR_MIGRATE_PEER2PEER)
+        virCheckNonNullArgGoto(dconnuri, error);
+    else
         dconnuri = NULL;
 
     if (virDomainMigrateUnmanaged(domain, NULL, flags,
@@ -4470,7 +4472,9 @@ virDomainMigrateToURI3(virDomainPtr domain,
     if (virDomainMigrateUnmanagedCheckCompat(domain, flags) < 0)
         goto error;
 
-    if (!(flags & VIR_MIGRATE_PEER2PEER))
+    if (flags & VIR_MIGRATE_PEER2PEER)
+        virCheckNonNullArgGoto(dconnuri, error);
+    else
         dconnuri = NULL;
 
     if (virDomainMigrateUnmanagedParams(domain, dconnuri,