From: John Ferlan <jferlan@redhat.com>
Date: Sat, 15 Aug 2015 13:15:42 +0000 (-0400)
Subject: qemu: Resolve Coverity UNINIT
X-Git-Tag: v1.2.19-rc1~62
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4cfc0d0377c6ec455e9c01cbe6583a6ab966c59;p=thirdparty%2Flibvirt.git

qemu: Resolve Coverity UNINIT

Coverity complained that 'vm' wasn't initialized before jumping to
cleanup: and calling virDomainObjEndAPI if the VIR_STRDUP fails.
So I initialized vm = NULL and also moved the VIR_STRDUP closer to
usage and used endjob for goto. Lots of other reasons for failures.
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 3683591c8f..4c0532432a 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -19888,7 +19888,7 @@ static int qemuDomainRename(virDomainPtr dom,
 {
     virQEMUDriverPtr driver = dom->conn->privateData;
     virQEMUDriverConfigPtr cfg = NULL;
-    virDomainObjPtr vm;
+    virDomainObjPtr vm = NULL;
     virObjectEventPtr event_new = NULL;
     virObjectEventPtr event_old = NULL;
     int ret = -1;
@@ -19902,9 +19902,6 @@ static int qemuDomainRename(virDomainPtr dom,
 
     virCheckFlags(0, ret);
 
-    if (VIR_STRDUP(new_dom_name, new_name) < 0)
-        goto cleanup;
-
     if (!(vm = qemuDomObjFromDomain(dom)))
         goto cleanup;
 
@@ -19940,6 +19937,9 @@ static int qemuDomainRename(virDomainPtr dom,
         goto endjob;
     }
 
+    if (VIR_STRDUP(new_dom_name, new_name) < 0)
+        goto endjob;
+
     if (virAsprintf(&rename_log_msg, ": domain %s has been renamed to %s\n",
                     vm->def->name, new_name) < 0) {
         goto endjob;