[vlc-commits] Revert "asx: fix use-after-free"

[Jean-Baptiste Kempf]

vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Apr 10 10:27:17 2015 +0200| [065074596933f9e942db5fe954be07f395879410] | committer: Jean-Baptiste Kempf

Revert "asx: fix use-after-free"

This reverts commit 2983a6e32a3e75a4fd149db7c618fe7f4123874a.

Ref #14062

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=065074596933f9e942db5fe954be07f395879410
---

 modules/demux/playlist/asx.c |   28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/modules/demux/playlist/asx.c b/modules/demux/playlist/asx.c
index 099cc5e..79a841d 100644
--- a/modules/demux/playlist/asx.c
+++ b/modules/demux/playlist/asx.c
@@ -210,11 +210,11 @@ static void ProcessEntry( int *pi_n_entry, xml_reader_t *p_xml_reader,
             /* Metadata Node */
             if( !strncasecmp( psz_node, "TITLE", 5 ) )
                 ReadElement( p_xml_reader, &psz_title );
-            else if( !strncasecmp( psz_node, "AUTHOR", 6 ) )
+            if( !strncasecmp( psz_node, "AUTHOR", 6 ) )
                 ReadElement( p_xml_reader, &psz_artist );
-            else if( !strncasecmp( psz_node, "COPYRIGHT", 9 ) )
+            if( !strncasecmp( psz_node, "COPYRIGHT", 9 ) )
                 ReadElement( p_xml_reader, &psz_copyright );
-            else if( !strncasecmp( psz_node,"MOREINFO", 8 ) )
+            if( !strncasecmp( psz_node,"MOREINFO", 8 ) )
             {
                 do
                 {
@@ -228,13 +228,13 @@ static void ProcessEntry( int *pi_n_entry, xml_reader_t *p_xml_reader,
                     psz_moreinfo = strdup( psz_node );
                 resolve_xml_special_chars( psz_moreinfo );
             }
-            else if( !strncasecmp( psz_node, "ABSTRACT", 8 ) )
+            if( !strncasecmp( psz_node, "ABSTRACT", 8 ) )
                 ReadElement( p_xml_reader, &psz_description );
-            else if( !strncasecmp( psz_node, "DURATION", 8 ) )
+            if( !strncasecmp( psz_node, "DURATION", 8 ) )
                 i_duration = ParseTime( p_xml_reader );
-            else if( !strncasecmp( psz_node, "STARTTIME", 9 ) )
+            if( !strncasecmp( psz_node, "STARTTIME", 9 ) )
                 i_start = ParseTime( p_xml_reader );
-            else
+
             /* Reference Node */
             /* All ref node will be converted into an entry */
             if( !strncasecmp( psz_node, "REF", 3 ) )
@@ -361,17 +361,17 @@ static int Demux( demux_t *p_demux )
                 ReadElement( p_xml_reader, &psz_title_asx );
                 input_item_SetTitle( p_current_input, psz_title_asx );
             }
-            else if( !strncasecmp( psz_node, "AUTHOR", 6 ) )
+            if( !strncasecmp( psz_node, "AUTHOR", 6 ) )
             {
                 ReadElement( p_xml_reader, &psz_txt );
                 input_item_SetArtist( p_current_input, psz_txt );
             }
-            else if( !strncasecmp( psz_node, "COPYRIGHT", 9 ) )
+            if( !strncasecmp( psz_node, "COPYRIGHT", 9 ) )
             {
                 ReadElement( p_xml_reader, &psz_txt );
                 input_item_SetCopyright( p_current_input, psz_txt );
             }
-            else if( !strncasecmp( psz_node, "MOREINFO", 8 ) )
+            if( !strncasecmp( psz_node, "MOREINFO", 8 ) )
             {
                 const char *psz_tmp;
                 do
@@ -388,16 +388,16 @@ static int Demux( demux_t *p_demux )
                 resolve_xml_special_chars( psz_txt );
                 input_item_SetURL( p_current_input, psz_txt );
             }
-            else if( !strncasecmp( psz_node, "ABSTRACT", 8 ) )
+            if( !strncasecmp( psz_node, "ABSTRACT", 8 ) )
             {
                 ReadElement( p_xml_reader, &psz_txt );
                 input_item_SetDescription( p_current_input, psz_txt );
             }
-            else
+
             /* Base Node handler */
             if( !strncasecmp( psz_node, "BASE", 4 ) )
                 ReadElement( p_xml_reader, &psz_base );
-            else
+
             /* Entry Ref Handler */
             if( !strncasecmp( psz_node, "ENTRYREF", 7 ) )
             {
@@ -418,7 +418,7 @@ static int Demux( demux_t *p_demux )
 
                 vlc_gc_decref( p_input );
             }
-            else
+
             /* Entry Handler */
             if( !strncasecmp( psz_node, "ENTRY", 5 ) )
             {