bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lib/libalpm/dload.c: Use STRDUP() instead of strdup()

Browse source 
Use the STRDUP macro instead of strdup() for the sake of better error
handling on memory allocation failures.

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Lukas Fleischer 2011-08-18 09:42:20 +02:00 • committed by Dan McGee
parent 0745288c14
commit d18e600952
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/libalpm/dload.c
View file

@ -387,10 +387,12 @@ cleanup:
tempfile, destfile, strerror(errno)); tempfile, destfile, strerror(errno));
ret = -1; ret = -1;
} else if(final_file) { } else if(final_file) {
*final_file = strdup(strrchr(destfile, '/') + 1); STRDUP(*final_file, strrchr(destfile, '/') + 1,
RET_ERR(handle, ALPM_ERR_MEMORY, -1));
} }
} else if(final_file) { } else if(final_file) {
*final_file = strdup(strrchr(tempfile, '/') + 1); STRDUP(*final_file, strrchr(tempfile, '/') + 1,
RET_ERR(handle, ALPM_ERR_MEMORY, -1));
} }
} }
@ -457,7 +459,7 @@ char SYMEXPORT *alpm_fetch_pkgurl(alpm_handle_t *handle, const char *url)
CALLOC(payload, 1, sizeof(*payload), RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); CALLOC(payload, 1, sizeof(*payload), RET_ERR(handle, ALPM_ERR_MEMORY, NULL));
payload->handle = handle; payload->handle = handle;
payload->fileurl = strdup(url); STRDUP(payload->fileurl, url, RET_ERR(handle, ALPM_ERR_MEMORY, NULL));
payload->allow_resume = 1; payload->allow_resume = 1;
/* download the file */ /* download the file */