Compile fix + handle case with no xml:base

933d7b13 · Christophe Mutricy · 04be77f7 · 933d7b13
Commit 933d7b13 authored Oct 25, 2006 by Christophe Mutricy
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

modules/demux/playlist/xspf.c modules/demux/playlist/xspf.c +3 -2

No files found.
--- a/modules/demux/playlist/xspf.c
+++ b/modules/demux/playlist/xspf.c
@@ -533,7 +533,8 @@ static vlc_bool_t parse_track_node COMPLEX_INTERFACE

                    if( psz_uri )
                    {
-                        if( !strstr( psz_uri, "://" ) )
+                        if( p_demux->p_sys->psz_base && 
+                            !strstr( psz_uri, "://" ) )
                        {
                           char* psz_tmp = malloc( 
                                   strlen(p_demux->p_sys->psz_base) + 
@@ -541,7 +542,7 @@ static vlc_bool_t parse_track_node COMPLEX_INTERFACE
                           if( !psz_tmp )
                           {
                               msg_Err( p_demux, "out of memory");
-                               return ENOMEM;
+                               return VLC_FALSE;
                           }
                           sprintf( psz_tmp, "%s%s", 
                                    p_demux->p_sys->psz_base, psz_uri );