Backport of [11286]

diff --git a/src/playlist/view.c b/src/playlist/view.c
index 4b2dc3d5f7dbd3bbd78bd8415234c4b5a3e6b585..1521c3fa545414661c103486abd0430d2b05bd24 100644 (file)
--- a/src/playlist/view.c
+++ b/src/playlist/view.c
@@ -896,6 +896,13 @@ playlist_item_t *playlist_RecursiveFindPrev( playlist_t *p_playlist,
                 /* Go up one level */
                 p_parent_parent = playlist_FindDirectParent( p_playlist,
                                             p_parent, i_view );
+                if( p_parent_parent == NULL )
+                {
+#ifdef PLAYLIST_DEBUG
+                    msg_Dbg( p_playlist, "Mmmh, couldn't find parent" );
+#endif
+                    return NULL;
+                }
                 return playlist_RecursiveFindPrev( p_playlist, i_view,p_root,
                                             p_parent, p_parent_parent );
             }