[vlc-devel] [PATCH 18/19] ttml demux: drop metadata tag inside p to avoid conflict

Francois Cartegnie fcvlcdev at free.fr
Wed Aug 31 12:23:31 CEST 2016


Le 29/08/2016 à 23:01, Stanislas Plessia a écrit :

> +++ b/modules/demux/ttml.c
> @@ -439,11 +439,10 @@ static int ParseTimeOnSpan( demux_sys_t* p_sys, char* psz_text )
>      {
>          if( i_type == XML_READER_STARTELEM && !strcasecmp( psz_node_name, "metadata" ) )
>          {
> -            do
> +            while ( i_type != XML_READER_ENDELEM || strcasecmp( psz_node_name, "metadata" ) )
>              {
>                  i_type = xml_ReaderNextNode( p_sys->p_reader, &psz_node_name );
> -            }while ( i_type != XML_READER_ENDELEM || strcasecmp( psz_node_name, "metadata" ) );
> -            i_type = xml_ReaderNextNode( p_sys->p_reader, &psz_node_name );
> +            }

The whole code is incorrect as self closing tags will never fire ENDELEM.

Francois



More information about the vlc-devel mailing list