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

[git version control]

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

XSPF: fix NULL dereference on empty <location>

(cherry picked from commit 8902488ba529c0cf4c903a8a84ff20b5737cc753)

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

 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 007b966..4da4bef 100644
--- a/modules/demux/playlist/xspf.c
+++ b/modules/demux/playlist/xspf.c
@@ -555,6 +555,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