diff mbox

[FFmpeg-devel,2/2] avcodec/atrac9dec: Check q_unit_cnt more completely before using it to access at9_tab_band_ext_group

Message ID 20191203212355.20860-2-michael@niedermayer.cc
State Accepted
Commit e1d836d2375c93cbc44a2b0d34e404682c1e8436
Headers show

Commit Message

Michael Niedermayer Dec. 3, 2019, 9:23 p.m. UTC
Fixes: index 8 out of bounds for type 'const uint8_t [8][3]'
Fixes: 19127/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ATRAC9_fuzzer-5709394985091072

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/atrac9dec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Lynne Dec. 6, 2019, 1:22 p.m. UTC | #1
Dec 3, 2019, 21:23 by michael@niedermayer.cc:

> Fixes: index 8 out of bounds for type 'const uint8_t [8][3]'
> Fixes: 19127/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ATRAC9_fuzzer-5709394985091072
>
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
>

LGTM
Michael Niedermayer Dec. 7, 2019, 2:40 p.m. UTC | #2
On Fri, Dec 06, 2019 at 02:22:32PM +0100, Lynne wrote:
> Dec 3, 2019, 21:23 by michael@niedermayer.cc:
> 
> > Fixes: index 8 out of bounds for type 'const uint8_t [8][3]'
> > Fixes: 19127/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ATRAC9_fuzzer-5709394985091072
> >
> > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> >
> 
> LGTM

will apply

thx

[...]
diff mbox

Patch

diff --git a/libavcodec/atrac9dec.c b/libavcodec/atrac9dec.c
index e3e4f2f14e..5415d1348e 100644
--- a/libavcodec/atrac9dec.c
+++ b/libavcodec/atrac9dec.c
@@ -199,7 +199,7 @@  static inline int parse_band_ext(ATRAC9Context *s, ATRAC9BlockData *b,
     int ext_band = 0;
 
     if (b->has_band_ext) {
-        if (b->q_unit_cnt < 13)
+        if (b->q_unit_cnt < 13 || b->q_unit_cnt > 20)
             return AVERROR_INVALIDDATA;
         ext_band = at9_tab_band_ext_group[b->q_unit_cnt - 13][2];
         if (stereo) {