From: Martin Kletzander <mkletzan@redhat.com>
Date: Wed, 15 Mar 2017 08:10:12 +0000 (+0100)
Subject: vmware: Fix some initialization problems
X-Git-Tag: v3.2.0-rc1~99
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97a84a9344a3558c5747fedd33573cdc8cf37856;p=thirdparty%2Flibvirt.git

vmware: Fix some initialization problems

Don't leak guest if adding it to virCapabilities fails.  Also return
NULL and not pointer to free'd object with zero references in such
case.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
---

diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c
index 0c2b0f4c0b..3ced61028e 100644
--- a/src/vmware/vmware_conf.c
+++ b/src/vmware/vmware_conf.c
@@ -105,14 +105,15 @@ vmwareCapsInit(void)
                                           VIR_DOMAIN_VIRT_VMWARE,
                                           NULL, NULL, 0, NULL) == NULL)
             goto error;
+        guest = NULL;
     }
 
- cleanup:
     return caps;
 
  error:
+    virCapabilitiesFreeGuest(guest);
     virObjectUnref(caps);
-    goto cleanup;
+    return NULL;
 }
 
 int