Commit 61d512e9 authored by Denis Charmet's avatar Denis Charmet Committed by Jean-Baptiste Kempf

Fix a crash with corrupted MKV

If the blocksize is corrupted and has a lace, you may have a buffer overflow. Should fix #5658.
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 31c91f64
......@@ -520,6 +520,14 @@ void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock
tk->b_inited = true;
size_t frame_size = 0;
size_t block_size = 0;
if( simpleblock != NULL )
block_size = simpleblock->GetSize();
else
block_size = block->GetSize();
for( unsigned int i = 0;
( block != NULL && i < block->NumberFrames()) || ( simpleblock != NULL && i < simpleblock->NumberFrames() );
i++ )
......@@ -535,9 +543,14 @@ void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock
else
{
data = &block->GetBuffer(i);
// condition when the DTS is correct (keyframe or B frame == NOT P frame)
}
if( !data->Buffer() || data->Size() > SIZE_MAX )
frame_size += data->Size();
if( !data->Buffer() || data->Size() > SIZE_MAX || frame_size > block_size )
{
msg_Warn( p_demux, "Cannot read frame (too long or no frame)" );
break;
}
if( tk->i_compression_type == MATROSKA_COMPRESSION_HEADER && tk->p_compression_data != NULL )
p_block = MemToBlock( data->Buffer(), data->Size(), tk->p_compression_data->GetSize() );
......
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