Skip to content

V
vlc-2-2
Commit af878173 authored by Rémi Duraffort's avatar Rémi Duraffort Committed by Jean-Baptiste Kempf
Browse files
Options

mpeg_ts: fix potential array off by one

parent 95f14593
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
modules/mux/mpeg/ts.c
View file @ af878173
...@@ -557,10 +557,10 @@ static int Open( vlc_object_t *p_this ) ...@@ -557,10 +557,10 @@ static int Open( vlc_object_t *p_this )
{ {
p_sys->pmtmap[p_sys->i_pmtslots].i_pid = i_pid; p_sys->pmtmap[p_sys->i_pmtslots].i_pid = i_pid;
p_sys->pmtmap[p_sys->i_pmtslots].i_prog = p_sys->i_num_pmt - 1; p_sys->pmtmap[p_sys->i_pmtslots].i_prog = p_sys->i_num_pmt - 1;
if ( ++p_sys->i_pmtslots > MAX_PMT_PID ) if ( ++p_sys->i_pmtslots >= MAX_PMT_PID )
{ {
msg_Err( p_mux, "Number of pids in PMT > %d", MAX_PMT_PID ); msg_Err( p_mux, "Number of pids in PMT > %d", MAX_PMT_PID );
p_sys->i_pmtslots = MAX_PMT_PID; p_sys->i_pmtslots = MAX_PMT_PID - 1;
} }
} }
} }
...@@ -633,7 +633,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -633,7 +633,7 @@ static int Open( vlc_object_t *p_this )
if( i_pid == 0 ) if( i_pid == 0 )
{ {
if( i > MAX_PMT ) if( i >= MAX_PMT )
msg_Err( p_mux, "Number of PMTs > maximum (%d)", MAX_PMT ); msg_Err( p_mux, "Number of PMTs > maximum (%d)", MAX_PMT );
} }
else else
......
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