vlc/vlc-2.2 | branch: master | Francois Cartegnie <fcvlc...@free.fr> | Mon Sep 22 21:17:40 2014 +0200| [9cd23e9ab6a0d89dd2dca3124c958b8badd2e247] | committer: Jean-Baptiste Kempf
demux: mp4: fix heap buffer overflow (fix #12266) (cherry picked from commit 26258915a956bd1150d4d369d476770af21c71b7) Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=9cd23e9ab6a0d89dd2dca3124c958b8badd2e247 --- modules/demux/mp4/mp4.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c index 824b575..06732ce 100644 --- a/modules/demux/mp4/mp4.c +++ b/modules/demux/mp4/mp4.c @@ -1747,12 +1747,15 @@ static int TrackCreateChunksIndex( demux_t *p_demux, i_last = BOXDATA(p_stsc)->i_first_chunk[i_index] - 1; } - p_demux_track->chunk[0].i_sample_first = 0; - for( i_chunk = 1; i_chunk < p_demux_track->i_chunk_count; i_chunk++ ) + if ( p_demux_track->i_chunk_count ) { - p_demux_track->chunk[i_chunk].i_sample_first = - p_demux_track->chunk[i_chunk-1].i_sample_first + - p_demux_track->chunk[i_chunk-1].i_sample_count; + p_demux_track->chunk[0].i_sample_first = 0; + for( i_chunk = 1; i_chunk < p_demux_track->i_chunk_count; i_chunk++ ) + { + p_demux_track->chunk[i_chunk].i_sample_first = + p_demux_track->chunk[i_chunk-1].i_sample_first + + p_demux_track->chunk[i_chunk-1].i_sample_count; + } } msg_Dbg( p_demux, "track[Id 0x%x] read %d chunk", _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits