From: Laine Stump <laine@redhat.com>
Date: Fri, 12 Feb 2021 19:22:21 +0000 (-0500)
Subject: esx: reorder code to avoid need to VIR_FREE mimeType
X-Git-Tag: v7.1.0-rc1~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a69fa61cdfcc3942548d1b13aae3c5e5870e5bb;p=thirdparty%2Flibvirt.git

esx: reorder code to avoid need to VIR_FREE mimeType

mimeType is initialized to NULL, and then only set in one place, just
before a check (not involving mimeType) that then VIR_FREEs mimeType
if it fails. If we just reorder the code to do the check prior to
setting mimeType, then there won't be any need to VIR_FREE(mimeType)
on failure (because it will already be empty/NULL).

Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index 47873c0d54..2d010096a5 100644
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -2374,12 +2374,10 @@ esxDomainScreenshot(virDomainPtr domain, virStreamPtr stream,
 
     url = virBufferContentAndReset(&buffer);
 
-    mimeType = g_strdup("image/png");
-
-    if (esxStreamOpenDownload(stream, priv, url, 0, 0) < 0) {
-        VIR_FREE(mimeType);
+    if (esxStreamOpenDownload(stream, priv, url, 0, 0) < 0)
         goto cleanup;
-    }
+
+    mimeType = g_strdup("image/png");
 
  cleanup: