moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-05 17:15:04 -05:00
Code Issues Releases Wiki Activity

metalink: add some error checks

Browse Source 
malloc() and strdup() calls without checking return codes.

Reported-by: Markus Elfring
Bug: https://github.com/bagder/curl/issues/150
This commit is contained in:
Daniel Stenberg 2015-03-06 23:14:25 +01:00
parent 163d29826d
commit 3ac3331e14
1 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/tool_metalink.c
View File

@ -621,6 +621,8 @@ static int check_hash(const char *filename,
} }
result = malloc(digest_def->dparams->digest_resultlen); result = malloc(digest_def->dparams->digest_resultlen);
if(!result)
return -1;
while(1) { while(1) {
unsigned char buf[4096]; unsigned char buf[4096];
ssize_t len = read(fd, buf, sizeof(buf)); ssize_t len = read(fd, buf, sizeof(buf));
@ -676,12 +678,17 @@ static metalink_checksum *new_metalink_checksum_from_hex_digest
size_t i; size_t i;
size_t len = strlen(hex_digest); size_t len = strlen(hex_digest);
digest = malloc(len/2); digest = malloc(len/2);
if(!digest)
return 0;
for(i = 0; i < len; i += 2) { for(i = 0; i < len; i += 2) {
digest[i/2] = hex_to_uint(hex_digest+i); digest[i/2] = hex_to_uint(hex_digest+i);
} }
chksum = malloc(sizeof(metalink_checksum)); chksum = malloc(sizeof(metalink_checksum));
if(chksum) {
chksum->digest_def = digest_def; chksum->digest_def = digest_def;
chksum->digest = digest; chksum->digest = digest;
}
return chksum; return chksum;
} }
@ -689,8 +696,14 @@ static metalink_resource *new_metalink_resource(const char *url)
{ {
metalink_resource *res; metalink_resource *res;
res = malloc(sizeof(metalink_resource)); res = malloc(sizeof(metalink_resource));
if(res) {
res->next = NULL; res->next = NULL;
res->url = strdup(url); res->url = strdup(url);
if(!res->url) {
free(res);
return NULL;
}
}
return res; return res;
} }
@ -715,8 +728,15 @@ static metalinkfile *new_metalinkfile(metalink_file_t *fileinfo)
{ {
metalinkfile *f; metalinkfile *f;
f = (metalinkfile*)malloc(sizeof(metalinkfile)); f = (metalinkfile*)malloc(sizeof(metalinkfile));
if(!f)
return NULL;
f->next = NULL; f->next = NULL;
f->filename = strdup(fileinfo->name); f->filename = strdup(fileinfo->name);
if(!f->filename) {
free(f);
return NULL;
}
f->checksum = NULL; f->checksum = NULL;
f->resource = NULL; f->resource = NULL;
if(fileinfo->checksums) { if(fileinfo->checksums) {
@ -817,8 +837,10 @@ int parse_metalink(struct OperationConfig *config, struct OutStruct *outs,
url = new_getout(config); url = new_getout(config);
if(url) { if(url) {
metalinkfile *mlfile; metalinkfile *mlfile = new_metalinkfile(*files);
mlfile = new_metalinkfile(*files); if(!mlfile)
break;
if(!mlfile->checksum) { if(!mlfile->checksum) {
warnings = TRUE; warnings = TRUE;
fprintf(config->global->errors, fprintf(config->global->errors,