MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-31 17:43:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

[pipe] Fix crash if pipe is deleted after being written to (caused by double free)

Browse Source
This commit is contained in:
ejurgensen 2017-07-08 01:41:12 +02:00
parent a23bb0b7e2
commit 1549d0d4b5
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/inputs/pipe.c
View File

@ -494,15 +494,17 @@ static enum command_state
pipe_watch_update(void *arg, int *retval) pipe_watch_update(void *arg, int *retval)
{ {
union pipe_arg *cmdarg = arg; union pipe_arg *cmdarg = arg;
struct pipe *pipelist = NULL; struct pipe *pipelist;
struct pipe *pipe; struct pipe *pipe;
struct pipe *next; struct pipe *next;
int count; int count;
if (cmdarg) if (cmdarg)
pipelist = cmdarg->pipelist; pipelist = cmdarg->pipelist;
else
pipelist = NULL;
count = 0; // Removes pipes that are gone from the watchlist
for (pipe = pipe_watch_list; pipe; pipe = next) for (pipe = pipe_watch_list; pipe; pipe = next)
{ {
next = pipe->next; next = pipe->next;
@ -512,28 +514,32 @@ pipe_watch_update(void *arg, int *retval)
DPRINTF(E_DBG, L_PLAYER, "Pipe watch deleted: '%s'\n", pipe->path); DPRINTF(E_DBG, L_PLAYER, "Pipe watch deleted: '%s'\n", pipe->path);
watch_del(pipe); watch_del(pipe);
pipelist_remove(&pipe_watch_list, pipe); // Will free pipe pipelist_remove(&pipe_watch_list, pipe); // Will free pipe
continue;
} }
count++;
pipelist_remove(&pipelist, pipe);
} }
for (pipe = pipelist; pipe; pipe = next) // Looks for new pipes and adds them to the watchlist
for (pipe = pipelist, count = 0; pipe; pipe = next, count++)
{ {
next = pipe->next; next = pipe->next;
count++;
if (count > PIPE_MAX_WATCH) if (count > PIPE_MAX_WATCH)
{ {
DPRINTF(E_LOG, L_PLAYER, "Max open pipes reached (%d), will not watch '%s'\n", PIPE_MAX_WATCH, pipe->path); DPRINTF(E_LOG, L_PLAYER, "Max open pipes reached (%d), will not watch '%s'\n", PIPE_MAX_WATCH, pipe->path);
pipelist_remove(&pipelist, pipe); pipe_free(pipe);
continue; continue;
} }
DPRINTF(E_DBG, L_PLAYER, "Pipe watch added: '%s'\n", pipe->path); if (!pipelist_find(pipe_watch_list, pipe->id))
watch_add(pipe); {
pipelist_add(&pipe_watch_list, pipe); // Changes pipe->next DPRINTF(E_DBG, L_PLAYER, "Pipe watch added: '%s'\n", pipe->path);
watch_add(pipe);
pipelist_add(&pipe_watch_list, pipe); // Changes pipe->next
}
else
{
DPRINTF(E_DBG, L_PLAYER, "Pipe watch exists: '%s'\n", pipe->path);
pipe_free(pipe);
}
} }
*retval = 0; *retval = 0;