From: Olivier Houchard <ohouchard@haproxy.com>
Date: Thu, 8 Mar 2018 17:25:49 +0000 (+0100)
Subject: BUG/MINOR: unix: Don't mess up when removing the socket from the xfer_sock_list.
X-Git-Tag: v1.9-dev1~384
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec9516a6dc6df12299f94cea3c20b8333cac569f;p=thirdparty%2Fhaproxy.git

BUG/MINOR: unix: Don't mess up when removing the socket from the xfer_sock_list.

When removing the socket from the xfer_sock_list, we want to set
next->prev to prev, not to next->prev, which is useless.

This should be backported to 1.8.
---

diff --git a/src/proto_uxst.c b/src/proto_uxst.c
index 3ab637f20d..0f717385ec 100644
--- a/src/proto_uxst.c
+++ b/src/proto_uxst.c
@@ -157,7 +157,7 @@ static int uxst_find_compatible_fd(struct listener *l)
 		if (xfer_sock->prev)
 			xfer_sock->prev->next = xfer_sock->next;
 		if (xfer_sock->next)
-			xfer_sock->next->prev = xfer_sock->next->prev;
+			xfer_sock->next->prev = xfer_sock->prev;
 		free(xfer_sock);
 	}
 	return ret;