From: Pino Toscano <ptoscano@redhat.com>
Date: Mon, 5 Oct 2020 09:38:09 +0000 (+0200)
Subject: esx: call freeaddrinfo earlier in esxUtil_ResolveHostname
X-Git-Tag: v6.9.0-rc1~325
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3aaf23ff69cea9abb7b7a43d9ff3eb687a916a2e;p=thirdparty%2Flibvirt.git

esx: call freeaddrinfo earlier in esxUtil_ResolveHostname

Call freeaddrinfo() as soon as @result is not needed anymore, i.e. right
after getnameinfo(); this avoids calling freeaddrinfo() in two branches.

Signed-off-by: Pino Toscano <ptoscano@redhat.com>
Reviewed-by: Laine Stump <laine@redhat.com>
---

diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c
index 9100873326..555158f953 100644
--- a/src/esx/esx_util.c
+++ b/src/esx/esx_util.c
@@ -310,17 +310,15 @@ esxUtil_ResolveHostname(const char *hostname,
 
     errcode = getnameinfo(result->ai_addr, result->ai_addrlen, ipAddress,
                           ipAddress_length, NULL, 0, NI_NUMERICHOST);
+    freeaddrinfo(result);
 
     if (errcode != 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("Formatting IP address for host '%s' failed: %s"), hostname,
                        gai_strerror(errcode));
-        freeaddrinfo(result);
         return -1;
     }
 
-    freeaddrinfo(result);
-
     return 0;
 }