playlist_edit: improved range checks in shufflePlaylist()

855466df · Romain Bignon · Max Kellermann · 9fe459f6 · 855466df
Commit 855466df authored Feb 13, 2009 by Romain Bignon Committed by Max Kellermann Feb 13, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

playlist_edit.c src/playlist_edit.c +6 -1

No files found.
--- a/src/playlist_edit.c
+++ b/src/playlist_edit.c
@@ -357,7 +357,12 @@ void shufflePlaylist(struct playlist *playlist, unsigned start, unsigned end)
 {
 	const struct song *queued;

-	if (end-1 <= start || end > queue_length(&playlist->queue))
+	if (end > queue_length(&playlist->queue))
+		/* correct the "end" offset */
+		end = queue_length(&playlist->queue);
+
+	if ((start+1) >= end)
+		/* needs at least two entries. */
 		return;

 	queued = playlist_get_queued_song(playlist);