From: Daniel Stenberg Date: Sun, 25 Jan 2026 09:46:24 +0000 (+0100) Subject: noproxy: simplify, don't mix const non-const in strchr() X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7dc60bdb90c710c2e36b2d05aa3686ff491a9bbe;p=thirdparty%2Fcurl.git noproxy: simplify, don't mix const non-const in strchr() Ref: #20420 Closes #20425 --- diff --git a/lib/noproxy.c b/lib/noproxy.c index 541765b650..1421fb114d 100644 --- a/lib/noproxy.c +++ b/lib/noproxy.c @@ -148,7 +148,6 @@ static bool match_host(const char *token, size_t tokenlen, static bool match_ip(int type, const char *token, size_t tokenlen, const char *name) { - const char *check = token; char *slash; unsigned int bits = 0; char checkip[128]; @@ -156,11 +155,10 @@ static bool match_ip(int type, const char *token, size_t tokenlen, /* this cannot match */ return FALSE; /* copy the check name to a temp buffer */ - memcpy(checkip, check, tokenlen); + memcpy(checkip, token, tokenlen); checkip[tokenlen] = 0; - check = checkip; - slash = strchr(check, '/'); + slash = strchr(checkip, '/'); /* if the slash is part of this token, use it */ if(slash) { curl_off_t value; @@ -172,9 +170,9 @@ static bool match_ip(int type, const char *token, size_t tokenlen, *slash = 0; /* null-terminate there */ } if(type == TYPE_IPV6) - return Curl_cidr6_match(name, check, bits); + return Curl_cidr6_match(name, checkip, bits); else - return Curl_cidr4_match(name, check, bits); + return Curl_cidr4_match(name, checkip, bits); } /****************************************************************