Skip to content

V
vlc-1.1
Commit 6849c233 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

ASX: fix NULL derefence (LP#785979) 

Regression introduced by commit 4a590357.
(cherry picked from commit 719c0015f8a6889fd60de0d0ec95c189de8a8976)
parent c763db02
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 6 deletions
modules/demux/playlist/asx.c
View file @ 6849c233
......@@ -439,11 +439,15 @@ static int Demux( demux_t *p_demux )
}
else continue;
}
if( ( psz_parse = strcasestr( psz_parse, "/>" ) ) )
psz_parse += 2;
else if( ( psz_parse = strcasestr( psz_parse, "</MoreInfo>") ) )
psz_parse += 11;
else continue;
if( ( psz_backup = strcasestr( psz_parse, "/>" ) ) )
psz_parse = psz_backup + 2;
else if( ( psz_backup = strcasestr( psz_parse, "</MoreInfo>") ) )
psz_parse = psz_backup + 11;
else
{
psz_parse = NULL;
continue;
}
}
else if( !strncasecmp( psz_parse, "<ABSTRACT>", 10 ) )
{
......@@ -483,7 +487,6 @@ static int Demux( demux_t *p_demux )
}
if( ( psz_parse = strcasestr( psz_parse, "/>" ) ) )
psz_parse += 2;
else continue;
}
else if( !strncasecmp( psz_parse, "</Entry>", 8 ) )
{
......
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