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

Fix memory leak in download payload->remote_name

Browse Source 
In the sync code, we explicitly allocated a string for this field, while
in the dload code itself it was filled in with a pointer to another
string. This led to a memory leak in the sync download case.

Make remote_name non-const and always explicitly allocate it. This patch
ensures this as well as uses malloc + snprintf (rather than calloc) in
several codepaths, and eliminates the only use of PATH_MAX in the
download code.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-09-28 02:56:36 -05:00
parent ea3c47825e
commit f66f9f11cd
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/libalpm/dload.c
View File

@ -60,7 +60,7 @@ static char *get_fullpath(const char *path, const char *filename,
char *filepath; char *filepath;
/* len = localpath len + filename len + suffix len + null */ /* len = localpath len + filename len + suffix len + null */
size_t len = strlen(path) + strlen(filename) + strlen(suffix) + 1; size_t len = strlen(path) + strlen(filename) + strlen(suffix) + 1;
CALLOC(filepath, len, sizeof(char), return NULL); MALLOC(filepath, len, return NULL);
snprintf(filepath, len, "%s%s%s", path, filename, suffix); snprintf(filepath, len, "%s%s%s", path, filename, suffix);
return filepath; return filepath;
@ -279,22 +279,27 @@ static FILE *create_tempfile(struct dload_payload *payload, const char *localpat
{ {
int fd; int fd;
FILE *fp; FILE *fp;
char randpath[PATH_MAX]; char *randpath;
alpm_handle_t *handle = payload->handle; size_t len;
/* create a random filename, which is opened with O_EXCL */ /* create a random filename, which is opened with O_EXCL */
snprintf(randpath, PATH_MAX, "%salpmtmp.XXXXXX", localpath); len = strlen(localpath) + 14 + 1;
MALLOC(randpath, len, RET_ERR(payload->handle, ALPM_ERR_MEMORY, NULL));
snprintf(randpath, len, "%salpmtmp.XXXXXX", localpath);
if((fd = mkstemp(randpath)) == -1 || if((fd = mkstemp(randpath)) == -1 ||
!(fp = fdopen(fd, payload->tempfile_openmode))) { !(fp = fdopen(fd, payload->tempfile_openmode))) {
unlink(randpath); unlink(randpath);
close(fd); close(fd);
_alpm_log(handle, ALPM_LOG_ERROR, _alpm_log(payload->handle, ALPM_LOG_ERROR,
_("failed to create temporary file for download\n")); _("failed to create temporary file for download\n"));
return NULL; return NULL;
} }
/* fp now points to our alpmtmp.XXXXXX */ /* fp now points to our alpmtmp.XXXXXX */
STRDUP(payload->tempfile_name, randpath, RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); free(payload->tempfile_name);
payload->remote_name = strrchr(randpath, '/') + 1; payload->tempfile_name = randpath;
free(payload->remote_name);
STRDUP(payload->remote_name, strrchr(randpath, '/') + 1,
RET_ERR(payload->handle, ALPM_ERR_MEMORY, NULL));
return fp; return fp;
} }
@ -318,7 +323,7 @@ static int curl_download_internal(struct dload_payload *payload,
payload->tempfile_openmode = "wb"; payload->tempfile_openmode = "wb";
if(!payload->remote_name) { if(!payload->remote_name) {
payload->remote_name = get_filename(payload->fileurl); payload->remote_name = strdup(get_filename(payload->fileurl));
} }
if(!payload->remote_name || curl_gethost(payload->fileurl, hostname) != 0) { if(!payload->remote_name || curl_gethost(payload->fileurl, hostname) != 0) {
_alpm_log(handle, ALPM_LOG_ERROR, _("url '%s' is invalid\n"), payload->fileurl); _alpm_log(handle, ALPM_LOG_ERROR, _("url '%s' is invalid\n"), payload->fileurl);
@ -591,10 +596,11 @@ char SYMEXPORT *alpm_fetch_pkgurl(alpm_handle_t *handle, const char *url)
void _alpm_dload_payload_free(struct dload_payload *payload) { void _alpm_dload_payload_free(struct dload_payload *payload) {
ASSERT(payload, return); ASSERT(payload, return);
FREE(payload->fileurl); FREE(payload->remote_name);
FREE(payload->content_disp_name);
FREE(payload->tempfile_name); FREE(payload->tempfile_name);
FREE(payload->destfile_name); FREE(payload->destfile_name);
FREE(payload->content_disp_name);
FREE(payload->fileurl);
FREE(payload); FREE(payload);
} }

2
lib/libalpm/dload.h
View File

@ -27,8 +27,8 @@
struct dload_payload { struct dload_payload {
alpm_handle_t *handle; alpm_handle_t *handle;
const char *remote_name;
const char *tempfile_openmode; const char *tempfile_openmode;
char *remote_name;
char *tempfile_name; char *tempfile_name;
char *destfile_name; char *destfile_name;
char *content_disp_name; char *content_disp_name;

2
lib/libalpm/sync.c
View File

@ -872,7 +872,7 @@ static int download_files(alpm_handle_t *handle, alpm_list_t **deltas)
/* print server + filename into a buffer */ /* print server + filename into a buffer */
len = strlen(server_url) + strlen(payload->remote_name) + 2; len = strlen(server_url) + strlen(payload->remote_name) + 2;
CALLOC(payload->fileurl, len, sizeof(char), RET_ERR(handle, ALPM_ERR_MEMORY, -1)); MALLOC(payload->fileurl, len, RET_ERR(handle, ALPM_ERR_MEMORY, -1));
snprintf(payload->fileurl, len, "%s/%s", server_url, payload->remote_name); snprintf(payload->fileurl, len, "%s/%s", server_url, payload->remote_name);
payload->handle = handle; payload->handle = handle;
payload->allow_resume = 1; payload->allow_resume = 1;