From: Willy Tarreau <w@1wt.eu>
Date: Sat, 1 Oct 2016 07:20:32 +0000 (+0200)
Subject: BUG/MEDIUM: dns: don't randomly crash on out-of-memory
X-Git-Tag: v1.7-dev5~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3d8cd47e05c83cd5f515e52027110aaaa63ff0d;p=thirdparty%2Fhaproxy.git

BUG/MEDIUM: dns: don't randomly crash on out-of-memory

dns_init_resolvers() tries to emit the current resolver's name in the
error message in case of out-of-memory condition. But it must not do
it when initializing the trash before even having such a resolver
otherwise the user is certain to get a dirty crash instead of the
error message. No backport is needed.
---

diff --git a/src/dns.c b/src/dns.c
index fc9354ed55..f21c50807d 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -928,7 +928,7 @@ int dns_init_resolvers(void)
 
 	dns_trash_str = malloc(global.tune.bufsize);
 	if (dns_trash_str == NULL) {
-		Alert("Starting [%s] resolvers: out of memory.\n", curr_resolvers->id);
+		Alert("Starting resolvers: out of memory.\n");
 		return 0;
 	}