[vlc-commits] demux: avi: fix invalid dereference

2020-12-15 Thread Francois Cartegnie 
vlc/vlc-3.0 | branch: master | Francois Cartegnie  | Thu Oct 
22 15:30:10 2020 +0200| [a7f577ec26d35bbd7b2a3cda89d1b41bde69de9c] | committer: 
Hugo Beauzée-Luyssen

demux: avi: fix invalid dereference

the stored track index might not match the one
at parsing time

Reported by: Zhen Zhou, NSFOCUS Security Team

Signed-off-by: Hugo Beauzée-Luyssen 
(cherry picked from commit 41541125de479fdff0ed0dcd73a6bbc64e598727)
Signed-off-by: Hugo Beauzée-Luyssen 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=a7f577ec26d35bbd7b2a3cda89d1b41bde69de9c
---

 modules/demux/avi/avi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c
index fbd08b6422..9ca8043472 100644
--- a/modules/demux/avi/avi.c
+++ b/modules/demux/avi/avi.c
@@ -916,7 +916,7 @@ aviindex:
 tk->i_samplesize != 0 )
 continue;
 
-avi_chunk_list_t *p_strl = AVI_ChunkFind( p_hdrl, AVIFOURCC_strl, i, 
true );
+avi_chunk_list_t *p_strl = AVI_ChunkFind( p_hdrl, AVIFOURCC_strl, 
tk->fmt.i_id, true );
 avi_chunk_strf_t *p_strf = AVI_ChunkFind( p_strl, AVIFOURCC_strf, 0, 
false );
 if( !p_strf || p_strf->i_cat != AUDIO_ES )
 continue;

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] demux: avi: fix invalid dereference

2020-12-15 Thread Francois Cartegnie 
vlc | branch: master | Francois Cartegnie  | Thu Oct 22 
15:30:10 2020 +0200| [41541125de479fdff0ed0dcd73a6bbc64e598727] | committer: 
Hugo Beauzée-Luyssen

demux: avi: fix invalid dereference

the stored track index might not match the one
at parsing time

Reported by: Zhen Zhou, NSFOCUS Security Team

Signed-off-by: Hugo Beauzée-Luyssen 

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=41541125de479fdff0ed0dcd73a6bbc64e598727
---

 modules/demux/avi/avi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c
index 8edab47a62..9174b3167b 100644
--- a/modules/demux/avi/avi.c
+++ b/modules/demux/avi/avi.c
@@ -784,7 +784,7 @@ aviindex:
 {
 continue;
 }
-p_strl = AVI_ChunkFind( p_hdrl, AVIFOURCC_strl, i, true );
+p_strl = AVI_ChunkFind( p_hdrl, AVIFOURCC_strl, tk->fmt.i_id, true );
 p_auds = AVI_ChunkFind( p_strl, AVIFOURCC_strf, 0, false );
 
 if( p_auds &&

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits