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

tool_getparam: parse --trace-config without strdup()/free()

Browse source 
Closes #16559
This commit is contained in:
Daniel Stenberg 2025-03-04 17:12:46 +01:00
parent 0825cf42f0
commit d121bc9884
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1 changed files with 25 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/tool_getparam.c
View file

@ -685,28 +685,31 @@ static void sethttpver(struct GlobalConfig *global,
}
static CURLcode set_trace_config(struct GlobalConfig *global,
const char *config)
const char *token)
{
CURLcode result = CURLE_OK;
char *token, *tmp, *name;
const char *next, *name;
bool toggle;
tmp = strdup(config);
if(!tmp)
return CURLE_OUT_OF_MEMORY;
/* Allow strtok() here since this is not used threaded */
/* !checksrc! disable BANNEDFUNC 2 */
token = strtok(tmp, ", ");
while(token) {
size_t len;
next = strchr(token, ',');
if(next)
len = next - token;
else
len = strlen(token);
switch(*token) {
case '-':
toggle = FALSE;
name = token + 1;
len--;
break;
case '+':
toggle = TRUE;
name = token + 1;
len--;
break;
default:
toggle = TRUE;
@ -714,28 +717,35 @@ static CURLcode set_trace_config(struct GlobalConfig *global,
break;
}
if(strcasecompare(name, "all")) {
if((len == 3) && strncasecompare(name, "all", 3)) {
global->traceids = toggle;
global->tracetime = toggle;
result = curl_global_trace(token);
if(result)
goto out;
}
else if(strcasecompare(name, "ids")) {
else if((len == 3) && strncasecompare(name, "ids", 3)) {
global->traceids = toggle;
}
else if(strcasecompare(name, "time")) {
else if((len == 4) && strncasecompare(name, "time", 4)) {
global->tracetime = toggle;
}
else {
result = curl_global_trace(token);
char buffer[32];
msnprintf(buffer, sizeof(buffer), "%c%.*s", toggle ? '+' : '-',
(int)len, name);
result = curl_global_trace(buffer);
if(result)
goto out;
}
token = strtok(NULL, ", ");
if(next) {
next++;
if(*next == ' ')
next++;
}
token = next;
}
out:
free(tmp);
return result;
}