From: Willy Tarreau <w@1wt.eu>
Date: Tue, 15 Sep 2020 09:25:54 +0000 (+0200)
Subject: BUG/MINOR: server: report correct error message for invalid port on "socks4"
X-Git-Tag: v2.3-dev5~93
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9743f709d03c036b7a6da2fb260d0e77f9e04a3d;p=thirdparty%2Fhaproxy.git

BUG/MINOR: server: report correct error message for invalid port on "socks4"

The socks4 keyword parser was a bit too much copy-pasted, it only checks
for a null port and reports "invalid range". Let's properly check for the
1-65535 range and report the correct error.

It may be backported everywhere "socks4" is present (2.0).
---

diff --git a/src/server.c b/src/server.c
index ee743e7b99..12755cdac1 100644
--- a/src/server.c
+++ b/src/server.c
@@ -877,8 +877,8 @@ static int srv_parse_socks4(char **args, int *cur_arg,
 		goto err;
 	}
 
-	if (!port_low) {
-		ha_alert("'%s': invalid port range %d-%d.\n", args[*cur_arg], port_low, port_high);
+	if (port_low <= 0 || port_low > 65535) {
+		ha_alert("'%s': invalid port %d.\n", args[*cur_arg], port_low);
 		goto err;
 	}