[vlc-commits] m3u: Don't copy option from NULL current input

[Hugo Beauzée-Luyssen]

vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Wed Dec 19 13:41:51 2018 +0100| [23a611e80a9f64f344446109f152703426cae48b] | committer: Hugo Beauzée-Luyssen

m3u: Don't copy option from NULL current input

refs #19928

(cherry picked from commit cd1929d40e9aed06ba48be69f1de2e0c4dbc1730)
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=23a611e80a9f64f344446109f152703426cae48b
---

 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 d872a91112..9fff1f0ff3 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 );