[vlc-devel] commit: xspf: Fix a crash on track elements without a location ( Derk-Jan Hartman )

git version control git at videolan.org
Thu Jun 25 14:25:39 CEST 2009


vlc | branch: 1.0-bugfix | Derk-Jan Hartman <hartman at videolan.org> | Thu Jun 25 14:21:53 2009 +0200| [096dc2c748a48f53bf781935adbeafe7822932d8] | committer: Derk-Jan Hartman 

xspf: Fix a crash on track elements without a location

A <track> can have 0 or more <location> elements. VLC doesn't like elements without a uri however, so init an element with vlc://nop. Note also that we currently only support 1 location element per track....

This closes #2891
(cherry picked from commit 7c2247517587851b22ecb11ba8d88bbdf3dcbdac)

Signed-off-by: Derk-Jan Hartman <hartman at videolan.org>

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

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

diff --git a/modules/demux/playlist/xspf.c b/modules/demux/playlist/xspf.c
index 3bb1715..65214e8 100644
--- a/modules/demux/playlist/xspf.c
+++ b/modules/demux/playlist/xspf.c
@@ -416,7 +416,7 @@ static bool parse_track_node COMPLEX_INTERFACE
           {NULL,           UNKNOWN_CONTENT, {NULL} }
         };
 
-    input_item_t *p_new_input = input_item_New( p_demux, NULL, NULL );
+    input_item_t *p_new_input = input_item_New( p_demux, "vlc://nop", NULL );
 
     if( !p_new_input )
     {




More information about the vlc-devel mailing list