[vlc-commits] commit: XSPF: fix NULL dereference on empty <location> ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Mar  2 21:30:08 2010 +0200| [8902488ba529c0cf4c903a8a84ff20b5737cc753] | committer: Rémi Denis-Courmont 

XSPF: fix NULL dereference on empty <location>

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

 modules/demux/playlist/xspf.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/modules/demux/playlist/xspf.c b/modules/demux/playlist/xspf.c
index c24e0da..278ad10 100644
--- a/modules/demux/playlist/xspf.c
+++ b/modules/demux/playlist/xspf.c
@@ -538,6 +538,9 @@ static bool parse_track_node COMPLEX_INTERFACE
                 /* special case: location */
                 if( !strcmp( p_handler->name, "location" ) )
                 {
+                    if( psz_value == NULL )
+                        input_item_SetURI( p_new_input, "vlc://nop" );
+                    else
                     /* FIXME: This is broken. Scheme-relative (//...) locations
                      * and anchors (#...) are not resolved correctly. Also,
                      * host-relative (/...) and directory-relative locations