RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

command: fix segfault with playlist-{next,prev}-playlist 

This was wrongly assuming that playlist_path is always set for the
current playlist entry, but it's only set when a file was added by
expanding a playlist.

The crash in playlist_get_first_in_next_playlist can be reproduced with
mpv foo.mkv foo.zip, playlist-next, playlist-prev,
playlist-next-playlist. You need to run playlist-next, playlist-prev
first because foo.zip's playlist_path is NULL until you do that, which
makes playlist_get_first_in_next_playlist return immediately.

The crash in cmd_playlist_next_prev_playlist can be replicated with mpv
--loop-playlist foo.zip foo.mkv, running playlist-next until foo.mkv,
and playlist-play-next. Again, you need to open foo.zip first or its
playlist_path is NULL which skips running strcmp(entry->playlist_path,
mpctx->playlist->current->playlist_path).

Fixes https://github.com/mpv-player/mpv/issues/12495#issuecomment-1760968608
This commit is contained in:
Guido Cella 2023-10-13 10:12:46 +02:00 committed by Dudemanguy
parent 6f83a730ba
commit c470934236
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/playlist.c
View File

@ -221,7 +221,7 @@ struct playlist_entry *playlist_get_first_in_next_playlist(struct playlist *pl,
if (!entry) if (!entry)
return NULL; return NULL;
while (entry && entry->playlist_path && while (entry && entry->playlist_path && pl->current->playlist_path &&
strcmp(entry->playlist_path, pl->current->playlist_path) == 0) strcmp(entry->playlist_path, pl->current->playlist_path) == 0)
entry = playlist_entry_get_rel(entry, direction); entry = playlist_entry_get_rel(entry, direction);

1
player/command.c
View File

@ -5335,6 +5335,7 @@ static void cmd_playlist_next_prev_playlist(void *p)
: playlist_get_last(mpctx->playlist); : playlist_get_last(mpctx->playlist);
if (entry && entry->playlist_path && if (entry && entry->playlist_path &&
mpctx->playlist->current->playlist_path &&
strcmp(entry->playlist_path, strcmp(entry->playlist_path,
mpctx->playlist->current->playlist_path) == 0) mpctx->playlist->current->playlist_path) == 0)
entry = NULL; entry = NULL;