vlc | branch: master | Francois Cartegnie <fcvlc...@free.fr> | Mon Apr 7 14:35:15 2014 +0200| [b74243c89d67023b5dc9720e3f2153c3d94ad5c7] | committer: Francois Cartegnie
demux: mp4 fix memory corruption on CTTS indexes refs #11162 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b74243c89d67023b5dc9720e3f2153c3d94ad5c7 --- modules/demux/mp4/libmp4.c | 21 +++++++------ modules/demux/mp4/libmp4.h | 4 +-- modules/demux/mp4/mp4.c | 72 ++++++++++++++++++++++++++++++++++++-------- 3 files changed, 73 insertions(+), 24 deletions(-) diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c index 6b80d3d..fe94da0 100644 --- a/modules/demux/mp4/libmp4.c +++ b/modules/demux/mp4/libmp4.c @@ -1135,8 +1135,8 @@ static int MP4_ReadBox_stts( stream_t *p_stream, MP4_Box_t *p_box ) static void MP4_FreeBox_ctts( MP4_Box_t *p_box ) { - FREENULL( p_box->data.p_ctts->i_sample_count ); - FREENULL( p_box->data.p_ctts->i_sample_offset ); + FREENULL( p_box->data.p_ctts->pi_sample_count ); + FREENULL( p_box->data.p_ctts->pi_sample_offset ); } static int MP4_ReadBox_ctts( stream_t *p_stream, MP4_Box_t *p_box ) @@ -1147,21 +1147,24 @@ static int MP4_ReadBox_ctts( stream_t *p_stream, MP4_Box_t *p_box ) MP4_GET4BYTES( p_box->data.p_ctts->i_entry_count ); - p_box->data.p_ctts->i_sample_count = + p_box->data.p_ctts->pi_sample_count = calloc( p_box->data.p_ctts->i_entry_count, sizeof(uint32_t) ); - p_box->data.p_ctts->i_sample_offset = + p_box->data.p_ctts->pi_sample_offset = calloc( p_box->data.p_ctts->i_entry_count, sizeof(int32_t) ); - if( ( p_box->data.p_ctts->i_sample_count == NULL ) - || ( p_box->data.p_ctts->i_sample_offset == NULL ) ) + if( ( p_box->data.p_ctts->pi_sample_count == NULL ) + || ( p_box->data.p_ctts->pi_sample_offset == NULL ) ) { MP4_READBOX_EXIT( 0 ); } - for( unsigned int i = 0; (i < p_box->data.p_ctts->i_entry_count )&&( i_read >=8 ); i++ ) + uint32_t i = 0; + for( ; (i < p_box->data.p_ctts->i_entry_count )&&( i_read >=8 ); i++ ) { - MP4_GET4BYTES( p_box->data.p_ctts->i_sample_count[i] ); - MP4_GET4BYTES( p_box->data.p_ctts->i_sample_offset[i] ); + MP4_GET4BYTES( p_box->data.p_ctts->pi_sample_count[i] ); + MP4_GET4BYTES( p_box->data.p_ctts->pi_sample_offset[i] ); } + if ( i < p_box->data.p_ctts->i_entry_count ) + p_box->data.p_ctts->i_entry_count = i; #ifdef MP4_VERBOSE msg_Dbg( p_stream, "read box: \"ctts\" entry-count %d", diff --git a/modules/demux/mp4/libmp4.h b/modules/demux/mp4/libmp4.h index 4e53426..59b57e9 100644 --- a/modules/demux/mp4/libmp4.h +++ b/modules/demux/mp4/libmp4.h @@ -478,8 +478,8 @@ typedef struct MP4_Box_data_ctts_s uint32_t i_entry_count; - uint32_t *i_sample_count; /* these are array */ - int32_t *i_sample_offset; + uint32_t *pi_sample_count; /* these are array */ + int32_t *pi_sample_offset; } MP4_Box_data_ctts_t; diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c index eb20228..d21edb7 100644 --- a/modules/demux/mp4/mp4.c +++ b/modules/demux/mp4/mp4.c @@ -1627,65 +1627,111 @@ static int TrackCreateSamplesIndex( demux_t *p_demux, { MP4_Box_data_ctts_t *ctts = p_box->data.p_ctts; - msg_Warn( p_demux, "CTTS table" ); + msg_Warn( p_demux, "CTTS table of %"PRIu32" entries", ctts->i_entry_count ); /* Create pts-dts table per chunk */ i_index = 0; i_index_sample_used = 0; for( i_chunk = 0; i_chunk < p_demux_track->i_chunk_count; i_chunk++ ) { mp4_chunk_t *ck = &p_demux_track->chunk[i_chunk]; - int64_t i_entry, i_sample_count, i; + uint32_t i_entry, i_sample_count, i; /* count how many entries are needed for this chunk * for p_sample_delta_dts and p_sample_count_dts */ i_sample_count = ck->i_sample_count; i_entry = 0; + uint32_t i_array_offset = i_index; while( i_sample_count > 0 ) { - i_sample_count -= ctts->pi_sample_count[i_index+i_entry]; + if ( (UINT32_MAX - i_index) > i_entry ) + i_array_offset = i_index + i_entry; + else + i_array_offset = UINT32_MAX; + + if ( i_array_offset >= ctts->i_entry_count ) + { + msg_Err( p_demux, "invalid index counting total samples %u %u", i_array_offset, ctts->i_entry_count ); + return VLC_EGENERIC; + } + + if ( i_sample_count > ctts->pi_sample_count[i_array_offset] ) + i_sample_count -= ctts->pi_sample_count[i_array_offset]; + else + i_sample_count = 0; /* don't count already used sample in this entry */ if( i_entry == 0 ) - i_sample_count += i_index_sample_used; + { + if ( i_index_sample_used < ( UINT32_MAX - i_sample_count ) ) + i_sample_count += i_index_sample_used; + } - i_entry++; + if (likely( i_entry != UINT32_MAX )) + i_entry++; + else + { + msg_Err( p_demux, "suspiciously high number of i_entry" ); + break; /* likely will go ENOMEM now */ + } } /* allocate them */ ck->p_sample_count_pts = calloc( i_entry, sizeof( uint32_t ) ); ck->p_sample_offset_pts = calloc( i_entry, sizeof( int32_t ) ); if( !ck->p_sample_count_pts || !ck->p_sample_offset_pts ) + { + msg_Err( p_demux, "can't allocate memory for i_entry=%"PRIu32, i_entry ); return VLC_ENOMEM; + } /* now copy */ i_sample_count = ck->i_sample_count; + for( i = 0; i < i_entry; i++ ) { - int64_t i_used; - int64_t i_rest; + uint32_t i_used; + uint32_t i_rest; + + if ( i_index >= ctts->i_entry_count ) + { + msg_Err( p_demux, "invalid index total samples" ); + return VLC_EGENERIC; + } - i_rest = ctts->pi_sample_count[i_index] - - i_index_sample_used; + if ( i_index_sample_used < ctts->pi_sample_count[i_index] ) + i_rest = ctts->pi_sample_count[i_index] - i_index_sample_used; + else + i_rest = 0; i_used = __MIN( i_rest, i_sample_count ); - i_index_sample_used += i_used; - i_sample_count -= i_used; + if ( (UINT32_MAX - i_index_sample_used) > i_used ) + i_index_sample_used += i_used; + else + i_index_sample_used = UINT32_MAX; + + if ( i_used > i_sample_count ) + i_sample_count -= i_used; + else + i_sample_count = 0; ck->p_sample_count_pts[i] = i_used; ck->p_sample_offset_pts[i] = ctts->pi_sample_offset[i_index]; if( i_index_sample_used >= ctts->pi_sample_count[i_index] ) { - i_index++; i_index_sample_used = 0; + if (unlikely( i_index == UINT32_MAX )) + break; + else + i_index++; } } } } - msg_Dbg( p_demux, "track[Id 0x%x] read %d samples length:%"PRId64"s", + msg_Dbg( p_demux, "track[Id 0x%x] read %"PRIu32" samples length:%"PRId64"s", p_demux_track->i_track_ID, p_demux_track->i_sample_count, i_next_dts / p_demux_track->i_timescale ); _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits