From e74d6c5009db6955481cdc68902ac3876cc0ff10 Mon Sep 17 00:00:00 2001 From: Matthias Bolte Date: Mon, 27 Jul 2009 14:13:11 +0200 Subject: [PATCH] Fix memory leaks in esxDomainDumpXML * src/esx/esx_driver.c: remove leaks in esxDomainDumpXML() and simplify esxDomainXMLFromNative() --- src/esx/esx_driver.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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; -- 2.47.2