list_window: don't invoke callback out-of-range

[ncmpc.git] / src / screen_play.c

diff --git a/src/screen_play.c b/src/screen_play.c
index 05457f76263e95fafbed718c8d80caa401bd1d40..37825e6b640f2be6c4c20ec3931421a3fc8b6c3c 100644 (file)
--- a/src/screen_play.c
+++ b/src/screen_play.c
@@ -136,8 +136,8 @@ list_callback(unsigned idx, bool *highlight, char **second_column, G_GNUC_UNUSED
        static char songname[MAX_SONG_LENGTH];
        struct mpd_song *song;
 
-       if (playlist == NULL || idx >= playlist_length(playlist))
-               return NULL;
+       assert(playlist != NULL);
+       assert(idx < playlist_length(playlist));
 
        song = playlist_get(playlist, idx);
        if ((int)mpd_song_get_id(song) == current_song_id)