Skip to content

V
vlc-2-2
Commit 2983a6e3 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

asx: fix use-after-free 

(cherry picked from commit b430a05ea91872b7eb1a5efae1ce88ee3d799bb3)
parent 1e31a5a1
Show whitespace changes
Inline Side-by-side
Showing with 14 additions and 14 deletions
modules/demux/playlist/asx.c
View file @ 2983a6e3
...@@ -210,11 +210,11 @@ static void ProcessEntry( int *pi_n_entry, xml_reader_t *p_xml_reader, ...@@ -210,11 +210,11 @@ static void ProcessEntry( int *pi_n_entry, xml_reader_t *p_xml_reader,
/* Metadata Node */ /* Metadata Node */
if( !strncasecmp( psz_node, "TITLE", 5 ) ) if( !strncasecmp( psz_node, "TITLE", 5 ) )
ReadElement( p_xml_reader, &psz_title ); ReadElement( p_xml_reader, &psz_title );
if( !strncasecmp( psz_node, "AUTHOR", 6 ) ) else if( !strncasecmp( psz_node, "AUTHOR", 6 ) )
ReadElement( p_xml_reader, &psz_artist ); ReadElement( p_xml_reader, &psz_artist );
if( !strncasecmp( psz_node, "COPYRIGHT", 9 ) ) else if( !strncasecmp( psz_node, "COPYRIGHT", 9 ) )
ReadElement( p_xml_reader, &psz_copyright ); ReadElement( p_xml_reader, &psz_copyright );
if( !strncasecmp( psz_node,"MOREINFO", 8 ) ) else if( !strncasecmp( psz_node,"MOREINFO", 8 ) )
{ {
do do
{ {
...@@ -228,13 +228,13 @@ static void ProcessEntry( int *pi_n_entry, xml_reader_t *p_xml_reader, ...@@ -228,13 +228,13 @@ static void ProcessEntry( int *pi_n_entry, xml_reader_t *p_xml_reader,
psz_moreinfo = strdup( psz_node ); psz_moreinfo = strdup( psz_node );
resolve_xml_special_chars( psz_moreinfo ); resolve_xml_special_chars( psz_moreinfo );
} }
if( !strncasecmp( psz_node, "ABSTRACT", 8 ) ) else if( !strncasecmp( psz_node, "ABSTRACT", 8 ) )
ReadElement( p_xml_reader, &psz_description ); ReadElement( p_xml_reader, &psz_description );
if( !strncasecmp( psz_node, "DURATION", 8 ) ) else if( !strncasecmp( psz_node, "DURATION", 8 ) )
i_duration = ParseTime( p_xml_reader ); i_duration = ParseTime( p_xml_reader );
if( !strncasecmp( psz_node, "STARTTIME", 9 ) ) else if( !strncasecmp( psz_node, "STARTTIME", 9 ) )
i_start = ParseTime( p_xml_reader ); i_start = ParseTime( p_xml_reader );
else
/* Reference Node */ /* Reference Node */
/* All ref node will be converted into an entry */ /* All ref node will be converted into an entry */
if( !strncasecmp( psz_node, "REF", 3 ) ) if( !strncasecmp( psz_node, "REF", 3 ) )
...@@ -361,17 +361,17 @@ static int Demux( demux_t *p_demux ) ...@@ -361,17 +361,17 @@ static int Demux( demux_t *p_demux )
ReadElement( p_xml_reader, &psz_title_asx ); ReadElement( p_xml_reader, &psz_title_asx );
input_item_SetTitle( p_current_input, psz_title_asx ); input_item_SetTitle( p_current_input, psz_title_asx );
} }
if( !strncasecmp( psz_node, "AUTHOR", 6 ) ) else if( !strncasecmp( psz_node, "AUTHOR", 6 ) )
{ {
ReadElement( p_xml_reader, &psz_txt ); ReadElement( p_xml_reader, &psz_txt );
input_item_SetArtist( p_current_input, psz_txt ); input_item_SetArtist( p_current_input, psz_txt );
} }
if( !strncasecmp( psz_node, "COPYRIGHT", 9 ) ) else if( !strncasecmp( psz_node, "COPYRIGHT", 9 ) )
{ {
ReadElement( p_xml_reader, &psz_txt ); ReadElement( p_xml_reader, &psz_txt );
input_item_SetCopyright( p_current_input, psz_txt ); input_item_SetCopyright( p_current_input, psz_txt );
} }
if( !strncasecmp( psz_node, "MOREINFO", 8 ) ) else if( !strncasecmp( psz_node, "MOREINFO", 8 ) )
{ {
const char *psz_tmp; const char *psz_tmp;
do do
...@@ -388,16 +388,16 @@ static int Demux( demux_t *p_demux ) ...@@ -388,16 +388,16 @@ static int Demux( demux_t *p_demux )
resolve_xml_special_chars( psz_txt ); resolve_xml_special_chars( psz_txt );
input_item_SetURL( p_current_input, psz_txt ); input_item_SetURL( p_current_input, psz_txt );
} }
if( !strncasecmp( psz_node, "ABSTRACT", 8 ) ) else if( !strncasecmp( psz_node, "ABSTRACT", 8 ) )
{ {
ReadElement( p_xml_reader, &psz_txt ); ReadElement( p_xml_reader, &psz_txt );
input_item_SetDescription( p_current_input, psz_txt ); input_item_SetDescription( p_current_input, psz_txt );
} }
else
/* Base Node handler */ /* Base Node handler */
if( !strncasecmp( psz_node, "BASE", 4 ) ) if( !strncasecmp( psz_node, "BASE", 4 ) )
ReadElement( p_xml_reader, &psz_base ); ReadElement( p_xml_reader, &psz_base );
else
/* Entry Ref Handler */ /* Entry Ref Handler */
if( !strncasecmp( psz_node, "ENTRYREF", 7 ) ) if( !strncasecmp( psz_node, "ENTRYREF", 7 ) )
{ {
...@@ -418,7 +418,7 @@ static int Demux( demux_t *p_demux ) ...@@ -418,7 +418,7 @@ static int Demux( demux_t *p_demux )
vlc_gc_decref( p_input ); vlc_gc_decref( p_input );
} }
else
/* Entry Handler */ /* Entry Handler */
if( !strncasecmp( psz_node, "ENTRY", 5 ) ) if( !strncasecmp( psz_node, "ENTRY", 5 ) )
{ {
......
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