Skip to content

V
vlc-2-2
Commit 719c0015 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.
parent 0a1d5031
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 6 deletions
modules/demux/playlist/asx.c
View file @ 719c0015
...@@ -439,11 +439,15 @@ static int Demux( demux_t *p_demux ) ...@@ -439,11 +439,15 @@ static int Demux( demux_t *p_demux )
} }
else continue; else continue;
} }
if( ( psz_parse = strcasestr( psz_parse, "/>" ) ) ) if( ( psz_backup = strcasestr( psz_parse, "/>" ) ) )
psz_parse += 2; psz_parse = psz_backup + 2;
else if( ( psz_parse = strcasestr( psz_parse, "</MoreInfo>") ) ) else if( ( psz_backup = strcasestr( psz_parse, "</MoreInfo>") ) )
psz_parse += 11; psz_parse = psz_backup + 11;
else continue; else
{
psz_parse = NULL;
continue;
}
} }
else if( !strncasecmp( psz_parse, "<ABSTRACT>", 10 ) ) else if( !strncasecmp( psz_parse, "<ABSTRACT>", 10 ) )
{ {
...@@ -483,7 +487,6 @@ static int Demux( demux_t *p_demux ) ...@@ -483,7 +487,6 @@ static int Demux( demux_t *p_demux )
} }
if( ( psz_parse = strcasestr( psz_parse, "/>" ) ) ) if( ( psz_parse = strcasestr( psz_parse, "/>" ) ) )
psz_parse += 2; psz_parse += 2;
else continue;
} }
else if( !strncasecmp( psz_parse, "</Entry>", 8 ) ) 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