From: Matthias Bolte <matthias.bolte@googlemail.com>
Date: Mon, 27 Jul 2009 12:13:11 +0000 (+0200)
Subject: Fix memory leaks in esxDomainDumpXML
X-Git-Tag: v0.7.0~86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e74d6c5009db6955481cdc68902ac3876cc0ff10;p=thirdparty%2Flibvirt.git

Fix memory leaks in esxDomainDumpXML

* src/esx/esx_driver.c: remove leaks in esxDomainDumpXML() and simplify
  esxDomainXMLFromNative()
---

diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index aa73e463a8..2e84110eae 100644
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -2003,10 +2003,13 @@ esxDomainDumpXML(virDomainPtr domain, int flags)
     }
 
   cleanup:
+    esxVI_String_Free(&propertyNameList);
+    esxVI_ObjectContent_Free(&virtualMachine);
     VIR_FREE(datastoreName);
     VIR_FREE(vmxPath);
     VIR_FREE(url);
     VIR_FREE(vmx);
+    virDomainDefFree(def);
 
     return xml;
 
@@ -2029,7 +2032,7 @@ esxDomainXMLFromNative(virConnectPtr conn, const char *nativeFormat,
     if (STRNEQ(nativeFormat, "vmware-vmx")) {
         ESX_ERROR(conn, VIR_ERR_INVALID_ARG,
                   "Unsupported config format '%s'", nativeFormat);
-        goto cleanup;
+        return NULL;
     }
 
     def = esxVMX_ParseConfig(conn, nativeConfig);
@@ -2038,7 +2041,6 @@ esxDomainXMLFromNative(virConnectPtr conn, const char *nativeFormat,
         xml = virDomainDefFormat(conn, def, VIR_DOMAIN_XML_INACTIVE);
     }
 
-cleanup:
     virDomainDefFree(def);
 
     return xml;