luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tool_getparam: ECH param parsing refix

Browse Source 
Regression.

Fixes #16006
Reported-by: Milon Renatus
Closes #16010
This commit is contained in:
sftcd 2025-01-15 12:47:41 +00:00 committed by Daniel Stenberg
parent a6eac83481
commit ca1594e707
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tool_getparam.c
View File

@ -1132,13 +1132,11 @@ static ParameterError parse_ech(struct GlobalConfig *global,
err = PARAM_LIBCURL_DOESNT_SUPPORT; err = PARAM_LIBCURL_DOESNT_SUPPORT;
else if(strlen(nextarg) > 4 && strncasecompare("pn:", nextarg, 3)) { else if(strlen(nextarg) > 4 && strncasecompare("pn:", nextarg, 3)) {
/* a public_name */ /* a public_name */
nextarg += 3;
err = getstr(&config->ech_public, nextarg, DENY_BLANK); err = getstr(&config->ech_public, nextarg, DENY_BLANK);
} }
else if(strlen(nextarg) > 5 && strncasecompare("ecl:", nextarg, 4)) { else if(strlen(nextarg) > 5 && strncasecompare("ecl:", nextarg, 4)) {
/* an ECHConfigList */ /* an ECHConfigList */
nextarg += 4; if('@' != *(nextarg + 4)) {
if('@' != *nextarg) {
err = getstr(&config->ech_config, nextarg, DENY_BLANK); err = getstr(&config->ech_config, nextarg, DENY_BLANK);
} }
else { else {
@ -1146,7 +1144,7 @@ static ParameterError parse_ech(struct GlobalConfig *global,
char *tmpcfg = NULL; char *tmpcfg = NULL;
FILE *file; FILE *file;
nextarg++; /* skip over '@' */ nextarg += 5; /* skip over 'ecl:@' */
if(!strcmp("-", nextarg)) { if(!strcmp("-", nextarg)) {
file = stdin; file = stdin;
} }