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

dload: chmod tempfiles to respect umask

Browse source 
Dan: fix mask calculation, add it to the success/fail block instead.

Signed-off-by: Dave Reisner <dreisner@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dave Reisner 2011-10-17 09:47:06 -04:00 • committed by Dan McGee
parent 3343185473
commit f4875fab9b
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/libalpm/dload.c
View file

@ -178,6 +178,14 @@ static int utimes_long(const char *path, long seconds)
return 0; return 0;
} }
/* prefix to avoid possible future clash with getumask(3) */
static mode_t _getumask(void)
{
mode_t mask = umask(0);
umask(mask);
return mask;
}
static size_t parse_headers(void *ptr, size_t size, size_t nmemb, void *user) static size_t parse_headers(void *ptr, size_t size, size_t nmemb, void *user)
{ {
size_t realsize = size * nmemb; size_t realsize = size * nmemb;
@ -295,9 +303,12 @@ static FILE *create_tempfile(struct dload_payload *payload, const char *localpat
MALLOC(randpath, len, RET_ERR(payload->handle, ALPM_ERR_MEMORY, NULL)); MALLOC(randpath, len, RET_ERR(payload->handle, ALPM_ERR_MEMORY, NULL));
snprintf(randpath, len, "%salpmtmp.XXXXXX", localpath); snprintf(randpath, len, "%salpmtmp.XXXXXX", localpath);
if((fd = mkstemp(randpath)) == -1 || if((fd = mkstemp(randpath)) == -1 ||
fchmod(fd, ~(_getumask()) & 0666) ||
!(fp = fdopen(fd, payload->tempfile_openmode))) { !(fp = fdopen(fd, payload->tempfile_openmode))) {
unlink(randpath); unlink(randpath);
close(fd); if(fd >= 0) {
close(fd);
}
_alpm_log(payload->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;