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

tidy-up: replace Curl_safefree with free before re-assignment

Browse source 
Also drop `NULL` assignments after `Curl_safefree()`.

Closes #16640
This commit is contained in:
Viktor Szakats 2025-03-10 00:31:20 +01:00
parent 9b523773b8
commit 57218d5327
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
15 changed files with 45 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/tool_formparse.c
View file

@ -839,7 +839,6 @@ int formparse(struct OperationConfig *config,
goto fail;
}
Curl_safefree(part->data);
part->data = NULL;
part->size = -1;
res = CURLE_OK;
}
@ -876,7 +875,6 @@ int formparse(struct OperationConfig *config,
goto fail;
}
Curl_safefree(part->data);
part->data = NULL;
part->size = -1;
res = CURLE_OK;
}

6
src/tool_getparam.c
View file

@ -512,10 +512,10 @@ GetFileAndPassword(const char *nextarg, char **file, char **password)
char *certname, *passphrase;
if(nextarg) {
parse_cert_parameter(nextarg, &certname, &passphrase);
Curl_safefree(*file);
free(*file);
*file = certname;
if(passphrase) {
Curl_safefree(*password);
free(*password);
*password = passphrase;
}
}
@ -1503,7 +1503,7 @@ static ParameterError parse_verbose(struct GlobalConfig *global,
switch(global->verbosity) {
case 0:
global->verbosity = 1;
Curl_safefree(global->trace_dump);
free(global->trace_dump);
global->trace_dump = strdup("%");
if(!global->trace_dump)
err = PARAM_NO_MEM;

2
src/tool_operate.c
View file

@ -1783,7 +1783,7 @@ static CURLcode append2query(struct GlobalConfig *global,
if(uerr)
result = urlerr_cvt(uerr);
else {
Curl_safefree(per->url); /* free previous URL */
free(per->url); /* free previous URL */
per->url = updated; /* use our new URL instead! */
}
}

12
src/tool_setopt.c
View file

@ -406,7 +406,7 @@ static CURLcode libcurl_generate_slist(struct curl_slist *slist, int *slistno)
CLEAN1("curl_slist_free_all(slist%d);", *slistno);
CLEAN1("slist%d = NULL;", *slistno);
for(; slist; slist = slist->next) {
Curl_safefree(escaped);
free(escaped);
escaped = c_escape(slist->data, ZERO_TERMINATED);
if(!escaped)
return CURLE_OUT_OF_MEMORY;
@ -458,7 +458,7 @@ static CURLcode libcurl_generate_mime_part(CURL *curl,
case TOOLMIME_DATA:
data = part->data;
if(!ret) {
Curl_safefree(escaped);
free(escaped);
escaped = c_escape(data, ZERO_TERMINATED);
NULL_CHECK(escaped);
CODE2("curl_mime_data(part%d, \"%s\", CURL_ZERO_TERMINATED);",
@ -492,28 +492,28 @@ static CURLcode libcurl_generate_mime_part(CURL *curl,
}
if(!ret && part->encoder) {
Curl_safefree(escaped);
free(escaped);
escaped = c_escape(part->encoder, ZERO_TERMINATED);
NULL_CHECK(escaped);
CODE2("curl_mime_encoder(part%d, \"%s\");", mimeno, escaped);
}
if(!ret && filename) {
Curl_safefree(escaped);
free(escaped);
escaped = c_escape(filename, ZERO_TERMINATED);
NULL_CHECK(escaped);
CODE2("curl_mime_filename(part%d, \"%s\");", mimeno, escaped);
}
if(!ret && part->name) {
Curl_safefree(escaped);
free(escaped);
escaped = c_escape(part->name, ZERO_TERMINATED);
NULL_CHECK(escaped);
CODE2("curl_mime_name(part%d, \"%s\");", mimeno, escaped);
}
if(!ret && part->type) {
Curl_safefree(escaped);
free(escaped);
escaped = c_escape(part->type, ZERO_TERMINATED);
NULL_CHECK(escaped);
CODE2("curl_mime_type(part%d, \"%s\");", mimeno, escaped);