]> git.sesse.net Git - vlc/commitdiff
* xspf.c: fixes parsing with xtag - closes #1293
authorYoann Peronneau <yoann@videolan.org>
Tue, 2 Oct 2007 21:51:43 +0000 (21:51 +0000)
committerYoann Peronneau <yoann@videolan.org>
Tue, 2 Oct 2007 21:51:43 +0000 (21:51 +0000)
  Someone should check if we could make xtag not send ENDELEM for self-closing tags, as libxml doesn't.

modules/demux/playlist/xspf.c

index f47e55cccffccb2b4dd2622b34a66a9c42410fc4..1bdf9e118d703482159fa2a678e2f9b6652671d4 100644 (file)
@@ -769,9 +769,8 @@ static vlc_bool_t parse_extension_node COMPLEX_INTERFACE
                 if( !p_handler || !p_handler->name
                     || strcmp( p_handler->name, psz_name ))
                 {
-                    /* FIXME: see #1293
                     msg_Err( p_demux, "there's no open element left for <%s>",
-                             psz_name );*/
+                             psz_name );
                     FREE_ATT();
                     return VLC_FALSE;
                 }
@@ -840,6 +839,11 @@ static vlc_bool_t parse_extitem_node COMPLEX_INTERFACE
         msg_Warn( p_demux, "invalid \"href\" attribute" );
         return VLC_FALSE;
     }
+
+    /* fix for #1293 - XTAG sends ENDELEM for self closing tag */
+    /* (libxml sends NONE) */
+    xml_ReaderRead( p_xml_reader );
+
     return VLC_TRUE;
 }