From 0660acc3ab64d2c3ad99cae887a438f0648faa72 Mon Sep 17 00:00:00 2001
From: Francois Cartegnie <fcvlcdev@free.fr>
Date: Mon, 9 Nov 2020 10:30:59 +0100
Subject: [PATCH] demux: avi: fix invalid deref
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Hugo Beauzée-Luyssen <hugo@beauzee.fr>
(cherry picked from commit 16504feba9aa9ea946dc711eed113943f5285f05)
Signed-off-by: Hugo Beauzée-Luyssen <hugo@beauzee.fr>
---
modules/demux/avi/avi.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c
index 7868a0f90ee..ee31340bb6e 100644
--- a/modules/demux/avi/avi.c
+++ b/modules/demux/avi/avi.c
@@ -3003,7 +3003,8 @@ static void AVI_ExtractSubtitle( demux_t *p_demux,
p_indx->i_entriesinuse > 0 )
{
if( vlc_stream_Seek( p_demux->s, p_indx->idx.super[0].i_offset ) ||
- AVI_ChunkRead( p_demux->s, &ck, NULL ) )
+ AVI_ChunkRead( p_demux->s, &ck, NULL ) ||
+ ck.common.i_chunk_fourcc != AVIFOURCC_indx )
goto exit;
p_indx = &ck.indx;
}
--
GitLab