vlc | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Wed Mar 29 
09:46:48 2017 +0200| [c5320b8e5f89fe838d1b1c84130d9a67203a0bab] | committer: 
Hugo Beauzée-Luyssen

ram: Fix potential null dereference

Fix CID #1403399

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

 modules/demux/playlist/ram.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/demux/playlist/ram.c b/modules/demux/playlist/ram.c
index 68999d8..2195ff9 100644
--- a/modules/demux/playlist/ram.c
+++ b/modules/demux/playlist/ram.c
@@ -333,7 +333,8 @@ static int Demux( demux_t *p_demux )
                 free( psz_mrl );
                 goto error;
             }
-            input_item_AddOptions( p_input, i_options, ppsz_options, 0 );
+            if( ppsz_options )
+                input_item_AddOptions( p_input, i_options, ppsz_options, 0 );
 
             if( !EMPTY_STR( psz_artist ) ) input_item_SetArtist( p_input, 
psz_artist );
             if( !EMPTY_STR( psz_author ) ) input_item_SetPublisher( p_input, 
psz_author );

_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to