oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

queue/PlaylistEdit: fix crash in SetSongIdRange() while playing

Browse Source 
An assertion failure in UpdateQueuedSong() could trigger because the
`prev` parameter is always `nullptr`, but `queued` may be set.  And in
fact, calling UpdateQueuedSong() is only necessary when the queued
song was edited, to re-queue it with the new range.

Closes https://github.com/MusicPlayerDaemon/MPD/issues/901
This commit is contained in:
Max Kellermann 2020-06-11 07:06:59 +02:00
parent b7a99b4a4b
commit 5716cde1fb
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -1,4 +1,6 @@
ver 0.21.25 (not yet released) ver 0.21.25 (not yet released)
* protocol:
- fix crash when using "rangeid" while playing
ver 0.21.24 (2020/06/10) ver 0.21.24 (2020/06/10)
* protocol * protocol

9
src/queue/PlaylistEdit.cxx
View File

@ -431,6 +431,8 @@ playlist::SetSongIdRange(PlayerControl &pc, unsigned id,
if (position < 0) if (position < 0)
throw PlaylistError::NoSuchSong(); throw PlaylistError::NoSuchSong();
bool was_queued = false;
if (playing) { if (playing) {
if (position == current) if (position == current)
throw PlaylistError(PlaylistResult::DENIED, throw PlaylistError(PlaylistResult::DENIED,
@ -442,6 +444,10 @@ playlist::SetSongIdRange(PlayerControl &pc, unsigned id,
already; cancel that */ already; cancel that */
pc.LockCancel(); pc.LockCancel();
queued = -1; queued = -1;
/* schedule a call to UpdateQueuedSong() to
re-queue the song with its new range */
was_queued = true;
} }
} }
@ -464,7 +470,8 @@ playlist::SetSongIdRange(PlayerControl &pc, unsigned id,
song.SetEndTime(end); song.SetEndTime(end);
/* announce the change to all interested subsystems */ /* announce the change to all interested subsystems */
UpdateQueuedSong(pc, nullptr); if (was_queued)
UpdateQueuedSong(pc, nullptr);
queue.ModifyAtPosition(position); queue.ModifyAtPosition(position);
OnModified(); OnModified();
} }