From: Daniel Stenberg <daniel@haxx.se>
Date: Fri, 24 Feb 2023 17:38:32 +0000 (+0100)
Subject: telnet: error correctly for WS set to "x[num]"
X-Git-Tag: curl-8_0_0~151
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cbd3fd7cbbac2424659a691d9d5026b60ed34937;p=thirdparty%2Fcurl.git

telnet: error correctly for WS set to "x[num]"

Follow-up to e4f93be9d587
Reported-by: Harry Sintonen
Closes #10606
---

diff --git a/lib/telnet.c b/lib/telnet.c
index 720fbd10ae..dc39de481c 100644
--- a/lib/telnet.c
+++ b/lib/telnet.c
@@ -844,10 +844,10 @@ static CURLcode check_telnet_options(struct Curl_easy *data)
           char *p;
           unsigned long x = strtoul(arg, &p, 10);
           unsigned long y = 0;
-          if(Curl_raw_tolower(*p) == 'x') {
+          if(x && (x <= 0xffff) && Curl_raw_tolower(*p) == 'x') {
             p++;
             y = strtoul(p, NULL, 10);
-            if(x && y && (x <= 0xffff) && (y <= 0xffff)) {
+            if(y && (y <= 0xffff)) {
               tn->subopt_wsx = (unsigned short)x;
               tn->subopt_wsy = (unsigned short)y;
               tn->us_preferred[CURL_TELOPT_NAWS] = CURL_YES;