Skip to content

V
vlc
Commit f70500d2 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

* modules/demux/ts.c: fixed segfault.

parent a48589dd
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 20 deletions
modules/demux/ts.c
View file @ f70500d2
...@@ -2424,10 +2424,10 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat ) ...@@ -2424,10 +2424,10 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat )
break; break;
} }
} }
if( b_keep ) if( b_keep ) break;
break;
} }
} }
if( !b_keep ) if( !b_keep )
{ {
TAB_APPEND( i_pmt_rm, pmt_rm, pmt ); TAB_APPEND( i_pmt_rm, pmt_rm, pmt );
...@@ -2446,22 +2446,23 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat ) ...@@ -2446,22 +2446,23 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat )
int i_prg; int i_prg;
for( i_prg = 0; i_prg < pid->p_owner->i_prg; i_prg++ ) for( i_prg = 0; i_prg < pid->p_owner->i_prg; i_prg++ )
{ {
if( pid->p_owner->prg[i_prg]->i_pid_pmt == /* We only remove es that aren't defined by extra pmt */
pmt_rm[j]->i_pid && pid->es->id ) if( pid->p_owner->prg[i_prg]->i_pid_pmt !=
{ pmt_rm[j]->i_pid ) continue;
/* We only remove es that aren't defined by extra pmt */
if( p_sys->b_dvb_control )
{
if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, ACCESS_SET_PRIVATE_ID_STATE, i, VLC_FALSE ) )
p_sys->b_dvb_control = VLC_FALSE;
}
PIDClean( p_demux->out, pid ); if( p_sys->b_dvb_control && pid->es->id )
break; {
if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
ACCESS_SET_PRIVATE_ID_STATE, i,
VLC_FALSE ) )
p_sys->b_dvb_control = VLC_FALSE;
} }
}
if( !pid->b_valid ) PIDClean( p_demux->out, pid );
break; break;
}
if( !pid->b_valid ) break;
} }
} }
...@@ -2470,17 +2471,17 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat ) ...@@ -2470,17 +2471,17 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat )
{ {
if( p_sys->b_dvb_control ) if( p_sys->b_dvb_control )
{ {
if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, ACCESS_SET_PRIVATE_ID_STATE, pmt_rm[i]->i_pid, VLC_FALSE ) ) if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
ACCESS_SET_PRIVATE_ID_STATE,
pmt_rm[i]->i_pid, VLC_FALSE ) )
p_sys->b_dvb_control = VLC_FALSE; p_sys->b_dvb_control = VLC_FALSE;
} }
PIDClean( p_demux->out, &p_sys->pid[pmt_rm[i]->i_pid] ); PIDClean( p_demux->out, &p_sys->pid[pmt_rm[i]->i_pid] );
TAB_REMOVE( p_sys->i_pmt, p_sys->pmt, pmt_rm[i] ); TAB_REMOVE( p_sys->i_pmt, p_sys->pmt, pmt_rm[i] );
} }
if( pmt_rm )
{ if( pmt_rm ) free( pmt_rm );
free( pmt_rm );
}
} }
/* now create programs */ /* now create programs */
......
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