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

setopt: when setting bad protocols, don't store them

Browse source 
Both CURLOPT_PROTOCOLS_STR and CURLOPT_REDIR_PROTOCOLS_STR would
previously return error on bad input but would wrongly still store and
keep the partial (unacceptable) result in the handle.

Closes #19389
This commit is contained in:
Daniel Stenberg 2025-11-06 23:39:56 +01:00
parent 8e93a74a73
commit 684af00181
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

26
lib/setopt.c
View file

@ -2361,17 +2361,27 @@ static CURLcode setopt_cptr(struct Curl_easy *data, CURLoption option,
#endif /* USE_LIBSSH2 */
#endif /* USE_SSH */
case CURLOPT_PROTOCOLS_STR:
if(ptr)
return protocol2num(ptr, &s->allowed_protocols);
/* make a NULL argument reset to default */
s->allowed_protocols = (curl_prot_t) CURLPROTO_ALL;
if(ptr) {
curl_prot_t protos;
result = protocol2num(ptr, &protos);
if(!result)
s->allowed_protocols = protos;
}
else
/* make a NULL argument reset to default */
s->allowed_protocols = (curl_prot_t) CURLPROTO_ALL;
break;
case CURLOPT_REDIR_PROTOCOLS_STR:
if(ptr)
return protocol2num(ptr, &s->redir_protocols);
/* make a NULL argument reset to default */
s->redir_protocols = (curl_prot_t) CURLPROTO_REDIR;
if(ptr) {
curl_prot_t protos;
result = protocol2num(ptr, &protos);
if(!result)
s->redir_protocols = protos;
}
else
/* make a NULL argument reset to default */
s->redir_protocols = (curl_prot_t) CURLPROTO_REDIR;
break;
case CURLOPT_DEFAULT_PROTOCOL: