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

tool_operate: fix torture leaks with etags

Browse Source 
Spotted by torture testing 343 344 345 347.

Follow-up from cc71d35265
Pointed-out-by: Dan Fandrich

Closes #7969
This commit is contained in:
Daniel Stenberg 2021-11-05 23:20:14 +01:00
parent d1624b94f0
commit d3d079c138
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/tool_operate.c
View File

@ -812,6 +812,7 @@ static CURLcode single_transfer(struct GlobalConfig *global,
if(config->etag_compare_file) {
char *etag_from_file = NULL;
char *header = NULL;
ParameterError pe;
/* open file for reading: */
FILE *file = fopen(config->etag_compare_file, FOPEN_READTEXT);
@ -840,12 +841,14 @@ static CURLcode single_transfer(struct GlobalConfig *global,
}
/* add Etag from file to list of custom headers */
add2list(&config->headers, header);
pe = add2list(&config->headers, header);
Curl_safefree(header);
if(file) {
if(file)
fclose(file);
if(pe != PARAM_OK) {
result = CURLE_OUT_OF_MEMORY;
break;
}
}
@ -874,12 +877,16 @@ static CURLcode single_transfer(struct GlobalConfig *global,
}
curl = curl_easy_init();
result = add_per_transfer(&per);
if(curl)
result = add_per_transfer(&per);
if(result || !curl) {
curl_easy_cleanup(curl);
if(etag_save->stream)
fclose(etag_save->stream);
result = CURLE_OUT_OF_MEMORY;
break;
}
per->etag_save = etag_first; /* copy the whole struct */
if(state->uploadfile) {
per->uploadfile = strdup(state->uploadfile);
if(!per->uploadfile) {
@ -892,7 +899,6 @@ static CURLcode single_transfer(struct GlobalConfig *global,
per->config = config;
per->curl = curl;
per->urlnum = urlnode->num;
per->etag_save = etag_first; /* copy the whole struct */
/* default headers output stream is stdout */
heads = &per->heads;