From: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Date: Fri, 2 Oct 2015 07:52:52 +0000 (+0300)
Subject: migration: check dconnuri in p2p mode
X-Git-Tag: v1.2.21-rc1~77
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=44a96fe914064df20b016778add77f2667e65169;p=thirdparty%2Flibvirt.git

migration: check dconnuri in p2p mode

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>
---

diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
index fe89d8cd89..e6c8604e47 100644
--- a/src/libvirt-domain.c
+++ b/src/libvirt-domain.c
@@ -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,