git-market/curl-curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-10 23:51:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

tool: fix two more allocator mismatches

Browse Source 
memory allocated by libcurl (curl_maprintf) must be freed with
curl_free(), and memory allocated by the tool (curlx_strdup via
findfile) must be freed with curlx_free().

- tool_cfgable: ech_config is allocated with curl_maprintf, free it
  with curl_free() instead of tool_safefree()
- config2setopts: known hosts from findfile() is allocated with
  curlx_strdup, free it with curlx_free() instead of curl_free()

Follow-up to b71973c115

Closes #21150
This commit is contained in:
MarkLee131 2026-03-30 00:59:24 +08:00 committed by Daniel Stenberg
parent 2c26cea5ec
commit 9fcc7e4c43
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.mailmap
View File

@ -121,3 +121,4 @@ Andrew Kirillov <akirillo@uk.ibm.com>
Stephen Farrell <stephen.farrell@cs.tcd.ie>
Calvin Ruocco <calvin.ruocco@vector.com>
Hamza Bensliman <benslimanhamza99@gmail.com>
Kaixuan Li <kaixuan.li@ntu.edu.sg>

13
src/config2setopts.c
View File

@ -208,13 +208,20 @@ static CURLcode ssh_setopts(struct OperationConfig *config, CURL *curl,
if(!config->insecure_ok) {
char *known = config->knownhosts;
if(!known)
known = findfile(".ssh/known_hosts", FALSE);
if(!known) {
char *found = findfile(".ssh/known_hosts", FALSE);
if(found) {
known = curlx_strdup(found);
curl_free(found);
if(!known)
return CURLE_OUT_OF_MEMORY;
}
}
if(known) {
result = my_setopt_str(curl, CURLOPT_SSH_KNOWNHOSTS, known);
if(result) {
config->knownhosts = NULL;
curl_free(known);
curlx_free(known);
return result;
}
/* store it in global to avoid repeated checks */

14
src/tool_getparam.c
View File

@ -1267,10 +1267,16 @@ static ParameterError parse_ech(struct OperationConfig *config,
curlx_fclose(file);
if(err)
return err;
config->ech_config = curl_maprintf("ecl:%s", tmpcfg);
curlx_free(tmpcfg);
if(!config->ech_config)
return PARAM_NO_MEM;
{
char *tmp = curl_maprintf("ecl:%s", tmpcfg);
curlx_free(tmpcfg);
if(!tmp)
return PARAM_NO_MEM;
config->ech_config = curlx_strdup(tmp);
curl_free(tmp);
if(!config->ech_config)
return PARAM_NO_MEM;
}
} /* file done */
}
else {