diff options
| author | Max Kellermann <max@duempel.org> | 2009-01-14 11:41:22 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-01-14 11:41:22 +0100 |
| commit | e9311545f5e101289a6d1f1b54eface70cf83717 (patch) | |
| tree | 1297bf7d965b03b142bac02acc61a887e387bb28 | |
| parent | 525c507ac56815c295a3c671725c60bfe03baabc (diff) | |
| download | mpd-e9311545f5e101289a6d1f1b54eface70cf83717.tar.gz mpd-e9311545f5e101289a6d1f1b54eface70cf83717.tar.xz mpd-e9311545f5e101289a6d1f1b54eface70cf83717.zip | |
playlist: safely search the playlist for deleted song
When a song file is deleted during database update, all pointers to it
must be removed from the playlist. The "for" loop in
deleteASongFromPlaylist() did not deal with multiple copies of the
deleted song properly, and left instances of the (to-be-invalidated)
pointer in. Fix this by reversing the loop.
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | src/playlist.c | 2 |
2 files changed, 5 insertions, 3 deletions
@@ -15,8 +15,10 @@ MPD 0.14.1 - not yet released * configure.ac: check for pkg-config before using it * fix minor memory leak in decoder_tag() * fix cross-fading bug: it used to play some chunks of the new song twice -* playlist: fix assertion failure during playlist load -* playlist: implement Fisher-Yates shuffle properly +* playlist + - fix assertion failure during playlist load + - implement Fisher-Yates shuffle properly + - safely search the playlist for deleted song * use custom PRNG for volume dithering (speedup) * detect libid3tag without pkg-config diff --git a/src/playlist.c b/src/playlist.c index 96eff0a6f..1d2fb7306 100644 --- a/src/playlist.c +++ b/src/playlist.c @@ -743,7 +743,7 @@ deleteASongFromPlaylist(const struct song *song) if (NULL == playlist.songs) return; - for (unsigned i = 0; i < playlist.length; i++) + for (int i = playlist.length - 1; i >= 0; --i) if (song == playlist.songs[i]) deleteFromPlaylist(i); |