moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-08-13 17:03:50 -04:00
Code Issues Releases Wiki Activity

curl: fix memory leaked by parse_metalink()

Browse Source 
This commit fixes a regression introduced by curl-7_65_3-5-gb88940850.
Detected by tests 2005, 2008, 2009, 2010, 2011, and 2012 with valgrind
and libmetalink enabled.

Closes #4326
This commit is contained in:
Kamil Dudka 2019-09-11 16:32:11 +02:00
parent 83b4cfacba
commit 1ca91bcdb5
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tool_metalink.c
View File

@ -965,7 +965,7 @@ static void delete_metalink_resource(metalink_resource *res)
Curl_safefree(res); Curl_safefree(res);
} }
static void delete_metalinkfile(metalinkfile *mlfile) void delete_metalinkfile(metalinkfile *mlfile)
{ {
metalink_resource *res; metalink_resource *res;
if(mlfile == NULL) { if(mlfile == NULL) {

3
src/tool_metalink.h
View File

@ -105,6 +105,8 @@ extern const digest_params SHA256_DIGEST_PARAMS[1];
* Counts the resource in the metalinkfile. * Counts the resource in the metalinkfile.
*/ */
int count_next_metalink_resource(metalinkfile *mlfile); int count_next_metalink_resource(metalinkfile *mlfile);
void delete_metalinkfile(metalinkfile *mlfile);
void clean_metalink(struct OperationConfig *config); void clean_metalink(struct OperationConfig *config);
/* /*
@ -158,6 +160,7 @@ void metalink_cleanup(void);
#else /* USE_METALINK */ #else /* USE_METALINK */
#define count_next_metalink_resource(x) 0 #define count_next_metalink_resource(x) 0
#define delete_metalinkfile(x) (void)x
#define clean_metalink(x) (void)x #define clean_metalink(x) (void)x
/* metalink_cleanup() takes no arguments */ /* metalink_cleanup() takes no arguments */

4
src/tool_operate.c
View File

@ -2073,6 +2073,10 @@ static CURLcode serial_transfers(struct GlobalConfig *global,
result = post_transfer(global, share, per, result, &retry); result = post_transfer(global, share, per, result, &retry);
if(retry) if(retry)
continue; continue;
/* Release metalink related resources here */
delete_metalinkfile(per->mlfile);
per = del_transfer(per); per = del_transfer(per);
/* Bail out upon critical errors or --fail-early */ /* Bail out upon critical errors or --fail-early */