From: Jiri Denemark <jdenemar@redhat.com>
Date: Tue, 20 Oct 2015 12:40:42 +0000 (+0200)
Subject: qemu: Fix memory leak in qemuProcessStart
X-Git-Tag: v1.3.0-rc1~197
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=630341a215c3ba027b75e44af4488f066a0c6437;p=thirdparty%2Flibvirt.git

qemu: Fix memory leak in qemuProcessStart

nodeset should be freed in both success and failure paths.

While tmppath is freed immediately after it's consumed, moving it from
error to cleanup label is a bit more consistent and robust.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 92eab3ca30..524072c6e1 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -5104,14 +5104,14 @@ int qemuProcessStart(virConnectPtr conn,
     virObjectUnref(cfg);
     virObjectUnref(caps);
     VIR_FREE(nicindexes);
+    VIR_FREE(nodeset);
+    VIR_FREE(tmppath);
     return ret;
 
  error:
     /* We jump here if we failed to start the VM for any reason, or
      * if we failed to initialize the now running VM. kill it off and
      * pretend we never started it */
-    VIR_FREE(tmppath);
-    VIR_FREE(nodeset);
     if (priv->mon)
         qemuMonitorSetDomainLog(priv->mon, -1);
     qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, stop_flags);