From: Matthias Bolte <matthias.bolte@googlemail.com>
Date: Mon, 14 Sep 2009 10:44:33 +0000 (+0200)
Subject: ESX avoid potential leaks
X-Git-Tag: v0.7.1~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=847a7c7c2e31b58f7fde196e11840044cbb64126;p=thirdparty%2Flibvirt.git

ESX avoid potential leaks

* src/esx/esx_driver.c: reorder some function calls to avoid potential
  virDomainPtr leaks
---

diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index 8d1af7150c..f91d48dc90 100644
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -1047,14 +1047,14 @@ esxDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid)
             continue;
         }
 
-        domain = virGetDomain(conn, name_candidate, uuid_candidate);
-
-        if (domain == NULL) {
+        if (esxVI_GetVirtualMachinePowerState(conn, virtualMachine,
+                                              &powerState) < 0) {
             goto failure;
         }
 
-        if (esxVI_GetVirtualMachinePowerState(conn, virtualMachine,
-                                              &powerState) < 0) {
+        domain = virGetDomain(conn, name_candidate, uuid_candidate);
+
+        if (domain == NULL) {
             goto failure;
         }
 
@@ -1138,14 +1138,14 @@ esxDomainLookupByName(virConnectPtr conn, const char *name)
             continue;
         }
 
-        domain = virGetDomain(conn, name_candidate, uuid_candidate);
-
-        if (domain == NULL) {
+        if (esxVI_GetVirtualMachinePowerState(conn, virtualMachine,
+                                              &powerState) < 0) {
             goto failure;
         }
 
-        if (esxVI_GetVirtualMachinePowerState(conn, virtualMachine,
-                                              &powerState) < 0) {
+        domain = virGetDomain(conn, name_candidate, uuid_candidate);
+
+        if (domain == NULL) {
             goto failure;
         }