[6.0] 39dfc1c37 Duh: Never rush a fix.

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Wed May 22 09:03:11 UTC 2019


commit 39dfc1c37dd5a555487378eb24b9e8c47c99e3fd
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu May 9 07:43:21 2019 +0000

    Duh: Never rush a fix.

diff --git a/lib/libvarnish/vss.c b/lib/libvarnish/vss.c
index 4431dea0d..410fab9f3 100644
--- a/lib/libvarnish/vss.c
+++ b/lib/libvarnish/vss.c
@@ -108,7 +108,7 @@ int
 VSS_resolver_socktype(const char *addr, const char *def_port,
     vss_resolved_f *func, void *priv, const char **err, int socktype)
 {
-	struct addrinfo hints, *res0 = NULL, *res;
+	struct addrinfo hints, *res0, *res;
 	struct suckaddr *vsa;
 	char *h;
 	char *adp, *hop;
@@ -143,8 +143,7 @@ VSS_resolver_socktype(const char *addr, const char *def_port,
 				break;
 		}
 	}
-	if (res0 != NULL)
-		freeaddrinfo(res0);
+	freeaddrinfo(res0);
 	return (ret);
 }
 
@@ -191,6 +190,7 @@ VSS_ResolveOne(void *dst, const char *addr, const char *port,
 		else
 			retval = VSA_Build(dst, res->ai_addr, res->ai_addrlen);
 	}
-	freeaddrinfo(res);
+	if (res != NULL)
+		freeaddrinfo(res);
 	return (retval);
 }


More information about the varnish-commit mailing list