From: John Ferlan <jferlan@redhat.com>
Date: Thu, 23 May 2013 15:07:36 +0000 (-0400)
Subject: xen: Resolve Coverity FORWARD_NULL issue
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=677981d1be6304e79385ecbd7e16f01d54e8836e;p=libvirt.git

xen: Resolve Coverity FORWARD_NULL issue

Commit '18b14012' refactored the Xen code resulting in a Coverity
warning about possible NULL reference if the path where the XM driver
takes puts the def on it's list.  Moved/duplicated the virGetDomain()
call to pacify the possible NULL deref.
---

diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index 61bd584069..217d38096c 100644
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -1656,13 +1656,14 @@ xenUnifiedDomainDefineXML(virConnectPtr conn, const char *xml)
     if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) {
         if (xenXMDomainDefineXML(conn, def) < 0)
             goto cleanup;
+        ret = virGetDomain(conn, def->name, def->uuid);
         def = NULL; /* XM driver owns it now */
     } else {
         if (xenDaemonDomainDefineXML(conn, def) < 0)
             goto cleanup;
+        ret = virGetDomain(conn, def->name, def->uuid);
     }
 
-    ret = virGetDomain(conn, def->name, def->uuid);
     if (ret)
         ret->id = -1;