From: Christopher Faulet <cfaulet@haproxy.com>
Date: Sat, 20 Feb 2021 11:15:22 +0000 (+0100)
Subject: BUG/MINOR: server: Fix test on number of fields allowed in a server-state line
X-Git-Tag: v2.4-dev9~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28d7876a0cb0f2e8fa46c216937d361b0d7bcfbc;p=thirdparty%2Fhaproxy.git

BUG/MINOR: server: Fix test on number of fields allowed in a server-state line

When a server-state line is parsed, a test is performed to be sure there is
enough but not too much fields. However the test is buggy. The bug was
introduced in the commit ea2cdf55e ("MEDIUM: server: Don't introduce a new
server-state file version").

No backport needed.
---

diff --git a/src/server.c b/src/server.c
index c7ad950290..732643cbc4 100644
--- a/src/server.c
+++ b/src/server.c
@@ -3166,8 +3166,8 @@ static void srv_state_parse_line(char *buf, const int version, char **params, ch
 	/* if line is incomplete line, then ignore it.
 	 * otherwise, update useful flags */
 	if (version == 1 &&
-	    arg < SRV_STATE_FILE_MIN_FIELDS_VERSION_1 &&
-	    arg > SRV_STATE_FILE_MAX_FIELDS_VERSION_1)
+	    (arg < SRV_STATE_FILE_MIN_FIELDS_VERSION_1 ||
+	     arg > SRV_STATE_FILE_MAX_FIELDS_VERSION_1))
 		params[0] = NULL;
 }