aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2020-06-30 21:32:53 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2020-07-09 12:35:39 +0200
commitd25345bb006c8ba757eb3608bb55d18f5ae84c53 (patch)
treec8f43fb99991bb70b947787779f78223e01ad300
parent1ff86cb452c1ff7b975e3f3abe0a0443cd2f3266 (diff)
downloadffmpeg-d25345bb006c8ba757eb3608bb55d18f5ae84c53.tar.gz
avcodec/hcadec: Check total_band_count against imdct_in size
Fixes: index 128 out of bounds for type 'float [128]' Fixes: 23465/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HCA_fuzzer-5089866596745216 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 2d96c945312d3f62e3f872bfb51a593afb40e09a) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/hcadec.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/hcadec.c b/libavcodec/hcadec.c
index 5fa87319d2..f46ed699d1 100644
--- a/libavcodec/hcadec.c
+++ b/libavcodec/hcadec.c
@@ -157,6 +157,10 @@ static av_cold int decode_init(AVCodecContext *avctx)
} else
return AVERROR_INVALIDDATA;
+ if (c->total_band_count > FF_ARRAY_ELEMS(c->ch->imdct_in))
+ return AVERROR_INVALIDDATA;
+
+
while (get_bits_left(gb) >= 32) {
chunk = get_bits_long(gb, 32);
if (chunk == MKBETAG('v', 'b', 'r', 0)) {