aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-10-22 22:02:32 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-11-09 17:54:59 +0100
commitde5102fd92de8d353fdf060375ed3ce859c83977 (patch)
tree227aa5931953b4a681869c410181b449bea26ba0
parent55c97a763783540ee48a326a3e82fbdea42f8280 (diff)
downloadffmpeg-de5102fd92de8d353fdf060375ed3ce859c83977.tar.gz
avcodec/atrac3plus: Check split point in fill mode 3
Fixes: index 32 out of bounds for type 'int [32]' Fixes: 18350/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ATRAC3P_fuzzer-5643794862571520 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/atrac3plus.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/atrac3plus.c b/libavcodec/atrac3plus.c
index 9f964efb4d..8d17889582 100644
--- a/libavcodec/atrac3plus.c
+++ b/libavcodec/atrac3plus.c
@@ -456,6 +456,10 @@ static int decode_channel_wordlen(GetBitContext *gb, Atrac3pChanUnitCtx *ctx,
} else if (chan->fill_mode == 3) {
pos = ch_num ? chan->num_coded_vals + chan->split_point
: ctx->num_quant_units - chan->split_point;
+ if (pos > FF_ARRAY_ELEMS(chan->qu_wordlen)) {
+ av_log(avctx, AV_LOG_ERROR, "Split point beyond array\n");
+ pos = FF_ARRAY_ELEMS(chan->qu_wordlen);
+ }
for (i = chan->num_coded_vals; i < pos; i++)
chan->qu_wordlen[i] = 1;
}