vlc | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Wed Dec 19 13:41:51 2018 +0100| [cd1929d40e9aed06ba48be69f1de2e0c4dbc1730] | committer: Hugo Beauzée-Luyssen
m3u: Don't copy option from NULL current input refs #19928 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cd1929d40e9aed06ba48be69f1de2e0c4dbc1730 --- modules/demux/playlist/m3u.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/demux/playlist/m3u.c b/modules/demux/playlist/m3u.c index 77232269e8..9f00f3557a 100644 --- a/modules/demux/playlist/m3u.c +++ b/modules/demux/playlist/m3u.c @@ -312,7 +312,8 @@ static int ReadDir( stream_t *p_demux, input_item_node_t *p_subitems ) if( !p_input ) goto error; input_item_AddOptions( p_input, i_options, ppsz_options, 0 ); - input_item_CopyOptions( p_input, p_current_input ); + if ( p_current_input ) + input_item_CopyOptions( p_input, p_current_input ); if( !EMPTY_STR(psz_artist) ) input_item_SetArtist( p_input, psz_artist ); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
