Commit f5f8cc3a authored by François Cartegnie's avatar François Cartegnie 🤞 Committed by Hugo Beauzée-Luyssen
Browse files

demux: avi: check subindex, fix potential invalid deref



Reported by: Zhen Zhou, NSFOCUS Security Team
Signed-off-by: Hugo Beauzée-Luyssen's avatarHugo Beauzée-Luyssen <hugo@beauzee.fr>
(cherry picked from commit 072c3bf621f34efbc81048bd5db585f554b9d1b0)
Signed-off-by: Hugo Beauzée-Luyssen's avatarHugo Beauzée-Luyssen <hugo@beauzee.fr>
parent d9454acb
......@@ -2660,7 +2660,8 @@ static void AVI_IndexLoad_indx( demux_t *p_demux,
{
break;
}
if( ck_sub.indx.i_indextype == AVI_INDEX_OF_CHUNKS )
if( ck_sub.common.i_chunk_fourcc == AVIFOURCC_indx &&
ck_sub.indx.i_indextype == AVI_INDEX_OF_CHUNKS )
__Parse_indx( p_demux, &p_index[i_stream], pi_last_offset, &ck_sub.indx );
AVI_ChunkClean( p_demux->s, &ck_sub );
}
......
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