Skip to content

V
vlc-1.1
Commit 1a8198ec authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Fixed segfault with teletex/dvbs streams (double free).

parent a81b46ea
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 4 deletions
modules/demux/ts.c
View file @ 1a8198ec
......@@ -1367,8 +1367,7 @@ static void PIDInit( ts_pid_t *pid, vlc_bool_t b_psi, ts_psi_t *p_owner )
pid->p_owner = p_owner;
pid->i_owner_number = 0;
pid->extra_es = NULL;
pid->i_extra_es = 0;
TAB_INIT( pid->i_extra_es, pid->extra_es );
if( b_psi )
{
......@@ -3056,7 +3055,11 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt )
else
{
p_es = malloc( sizeof( ts_es_t ) );
p_es->fmt = pid->es->fmt;
es_format_Copy( &p_es->fmt, &pid->es->fmt );
free( p_es->fmt.psz_language ); p_es->fmt.psz_language = NULL;
free( p_es->fmt.psz_description ); p_es->fmt.psz_description = NULL;
p_es->id = NULL;
p_es->p_pes = NULL;
p_es->i_pes_size = 0;
......@@ -3153,7 +3156,11 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt )
else
{
p_es = malloc( sizeof( ts_es_t ) );
p_es->fmt = pid->es->fmt;
es_format_Copy( &p_es->fmt, &pid->es->fmt );
free( p_es->fmt.psz_language ); p_es->fmt.psz_language = NULL;
free( p_es->fmt.psz_description ); p_es->fmt.psz_description = NULL;
p_es->id = NULL;
p_es->p_pes = NULL;
p_es->i_pes_size = 0;
......
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