MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-14 00:05:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

[player] Fix possible segfault after playback stop on FreeBSD/machines with lo-res timers

Browse Source
This commit is contained in:
ejurgensen 2016-04-14 08:55:59 +02:00
parent bf27a879df
commit a07c24d625
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/player.c
View File

@ -1438,6 +1438,13 @@ source_check(void)
return 0;
}
if (player_state == PLAY_STOPPED)
{
DPRINTF(E_LOG, L_PLAYER, "Bug! source_check called but playback has already stopped\n");
return pos;
}
/* If cur_playing is NULL, we are still in the first two seconds after starting the stream */
if (!cur_playing)
{
@ -1674,7 +1681,7 @@ player_playback_cb(int fd, short what, void *arg)
packet_timer_last = timespec_add(packet_timer_last, packet_time);
}
while (timespec_cmp(packet_timer_last, next_tick) < 0);
while ((timespec_cmp(packet_timer_last, next_tick) < 0) && (player_state == PLAY_PLAYING));
/* Make sure playback is still running */
if (player_state == PLAY_STOPPED)