MyFavMirrors
/
owntone-server
mirror of https://github.com/owntone/owntone-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[pipe] Harden pict_tmpfile_recreate() against invalid input, take 2

This commit is contained in:
ejurgensen 2019-09-22 22:56:18 +02:00
parent d2921e9444
commit cae790ed7e
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/inputs/pipe.c
View File

@ -318,19 +318,17 @@ static int
pict_tmpfile_recreate(struct pipe_metadata *pm, const char *ext)
{
int offset = strlen(PIPE_TMPFILE_TEMPLATE) - PIPE_TMPFILE_TEMPLATE_EXTLEN;
int len = strlen(ext);
if (len > PIPE_TMPFILE_TEMPLATE_EXTLEN)
if (strlen(ext) > PIPE_TMPFILE_TEMPLATE_EXTLEN)
{
DPRINTF(E_LOG, L_PLAYER, "Invalid extension provided to pict_tmpfile_recreate (len=%d): '%s'\n", len, ext);
DPRINTF(E_LOG, L_PLAYER, "Invalid extension provided to pict_tmpfile_recreate: '%s'\n", ext);
return -1;
}
pict_tmpfile_close(pm);
strcpy(pm->pict_tmpfile_path, PIPE_TMPFILE_TEMPLATE);
// Use memcpy instead of strncpy because gcc 8 gives false warnings otherwise
memcpy(pm->pict_tmpfile_path + offset, ext, len);
strcpy(pm->pict_tmpfile_path + offset, ext);
pm->pict_tmpfile_fd = mkstemps(pm->pict_tmpfile_path, PIPE_TMPFILE_TEMPLATE_EXTLEN);