[vlc-commits] libvlc: media_list_player: Fix invalid subitem detection

Hugo Beauzée-Luyssen git at videolan.org
Mon Mar 19 15:08:22 CET 2018


vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Mon Mar 19 14:41:28 2018 +0100| [f6d5814b32774669e7d402a689ad2d164995bc8f] | committer: Hugo Beauzée-Luyssen

libvlc: media_list_player: Fix invalid subitem detection

Fix #19939

(cherry picked from commit eb7c30a86f4a6380ef4a350387f02c914aa9074a)
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=f6d5814b32774669e7d402a689ad2d164995bc8f
---

 lib/media_list_player.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/media_list_player.c b/lib/media_list_player.c
index d73415b1b3..7f4d427f63 100644
--- a/lib/media_list_player.c
+++ b/lib/media_list_player.c
@@ -159,8 +159,10 @@ get_next_path(libvlc_media_list_player_t * p_mlp, bool b_loop)
     /* If item just gained a sublist just play it */
     if (p_sublist_of_playing_item)
     {
+        int i_count = libvlc_media_list_count(p_sublist_of_playing_item);
         libvlc_media_list_release(p_sublist_of_playing_item);
-        return libvlc_media_list_path_copy_by_appending(p_mlp->current_playing_item_path, 0);
+        if (i_count > 0)
+            return libvlc_media_list_path_copy_by_appending(p_mlp->current_playing_item_path, 0);
     }
 
     /* Try to catch parent element */



More information about the vlc-commits mailing list