Skip to content

V
vlc-1.1
Commit 933d7b13 authored by Christophe Mutricy's avatar Christophe Mutricy
Browse files
Options

Compile fix + handle case with no xml:base

parent 04be77f7
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
modules/demux/playlist/xspf.c
View file @ 933d7b13
...@@ -533,7 +533,8 @@ static vlc_bool_t parse_track_node COMPLEX_INTERFACE ...@@ -533,7 +533,8 @@ static vlc_bool_t parse_track_node COMPLEX_INTERFACE
if( psz_uri ) if( psz_uri )
{ {
if( !strstr( psz_uri, "://" ) ) if( p_demux->p_sys->psz_base &&
!strstr( psz_uri, "://" ) )
{ {
char* psz_tmp = malloc( char* psz_tmp = malloc(
strlen(p_demux->p_sys->psz_base) + strlen(p_demux->p_sys->psz_base) +
...@@ -541,7 +542,7 @@ static vlc_bool_t parse_track_node COMPLEX_INTERFACE ...@@ -541,7 +542,7 @@ static vlc_bool_t parse_track_node COMPLEX_INTERFACE
if( !psz_tmp ) if( !psz_tmp )
{ {
msg_Err( p_demux, "out of memory"); msg_Err( p_demux, "out of memory");
return ENOMEM; return VLC_FALSE;
} }
sprintf( psz_tmp, "%s%s", sprintf( psz_tmp, "%s%s",
p_demux->p_sys->psz_base, psz_uri ); p_demux->p_sys->psz_base, psz_uri );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment