From: William Lallemand <wlallemand@haproxy.com>
Date: Tue, 24 Mar 2020 15:42:15 +0000 (+0100)
Subject: BUG/MINOR: peers: avoid an infinite loop with peers_fe is NULL
X-Git-Tag: v2.2-dev6~84
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ef2d565303af6dd7c24b62fdb22e43f1d1638bf;p=thirdparty%2Fhaproxy.git

BUG/MINOR: peers: avoid an infinite loop with peers_fe is NULL

Fix an infinite loop which was added in an attempt to fix #558.
If the peers_fe is NULL, it will loop forever.

Must be backported with a2cfd7e as far as 1.8.
---

diff --git a/src/cfgparse.c b/src/cfgparse.c
index 85fc185fb6..eaa853f6e1 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -3911,11 +3911,10 @@ out_uri_auth_compat:
 		 stick-table used in the configuration, set its bind_proc
 		 by default to the first process. */
 		while (curpeers) {
-			if (!curpeers->peers_fe)
-				continue;
-			if (curpeers->peers_fe->bind_proc == 0)
-				curpeers->peers_fe->bind_proc = 1;
-
+			if (curpeers->peers_fe) {
+				if (curpeers->peers_fe->bind_proc == 0)
+					curpeers->peers_fe->bind_proc = 1;
+			}
 			curpeers = curpeers->next;
 		}