From: Olivier Houchard <ohouchard@haproxy.com>
Date: Mon, 17 Jul 2017 15:25:33 +0000 (+0200)
Subject: BUG/MINOR: Prevent a use-after-free on error scenario on option "-x".
X-Git-Tag: v1.8-dev3~243
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=be7b1ce4c1580a897d979a59c2d489f66dc151b0;p=thirdparty%2Fhaproxy.git

BUG/MINOR: Prevent a use-after-free on error scenario on option "-x".

This was introduced with recent commit f73629d ("MINOR: global: Add an
option to get the old listening sockets."). No backport is needed.
---

diff --git a/src/haproxy.c b/src/haproxy.c
index 23161007f1..7af1092d93 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -997,6 +997,7 @@ static int get_old_sockets(const char *unixsocket)
 		if (getsockname(fd, (struct sockaddr *)&xfer_sock->addr, &socklen) != 0) {
 			Warning("Failed to get socket address\n");
 			free(xfer_sock);
+			xfer_sock = NULL;
 			continue;
 		}
 		if (curoff >= maxoff) {