aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-10-04 19:35:15 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2020-07-01 12:49:26 +0200
commit1fe652551b9b834034442d09f2c5150c0039b25c (patch)
tree4d343e68c62a12c46dfa5595e3c8f4c6cb953322
parent0799b34bbda888e2acb43b0c47f88703288e210d (diff)
downloadffmpeg-1fe652551b9b834034442d09f2c5150c0039b25c.tar.gz
avcodec/alsdec: Check that input space for header exists in read_diff_float_data()
Fixes: Timeout (21sec -> 8sec) Fixes: 17832/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ALS_fuzzer-5737092172218368 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 09581f7923ed9af7719762868e8f1ff626ea8374) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/alsdec.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c
index 2f0cdc0190..9fefe95f1c 100644
--- a/libavcodec/alsdec.c
+++ b/libavcodec/alsdec.c
@@ -1481,6 +1481,9 @@ static int read_diff_float_data(ALSDecContext *ctx, unsigned int ra_frame) {
ff_mlz_flush_dict(ctx->mlz);
}
+ if (avctx->channels * 8 > get_bits_left(gb))
+ return AVERROR_INVALIDDATA;
+
for (c = 0; c < avctx->channels; ++c) {
if (use_acf) {
//acf_flag