romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-23 10:22:13 +03:00
Code Issues Projects Releases Packages Wiki Activity

noproxy: simplify, don't mix const non-const in strchr()

Browse source 
Ref: #20420
Closes #20425
This commit is contained in:
Daniel Stenberg 2026-01-25 10:46:24 +01:00
parent 6f7ce1e45f
commit 7dc60bdb90
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/noproxy.c
View file

@ -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);
}
/****************************************************************