summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2020-09-19 11:29:01 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2021-09-09 13:37:21 +0200
commitd859b40bf2b074cd5be69e978177a5cec4ce65be (patch)
tree5ac3b824d70c3e2c5a6b5f1696bb666ef10626c4
parentdb94bff82687a55b7ec86db5b927c04008ad8756 (diff)
downloadffmpeg-d859b40bf2b074cd5be69e978177a5cec4ce65be.tar.gz
avcodec/sonic: Check for overread
Fixes: Timeout (too long -> 1.3 sec) Fixes: 24358/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SONIC_fuzzer-5107284099989504 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 eeabdef1bf96cdecf80aeb8d0478d008457b048c) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/sonic.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/sonic.c b/libavcodec/sonic.c
index ad1552a434..2dc04846ab 100644
--- a/libavcodec/sonic.c
+++ b/libavcodec/sonic.c
@@ -1031,6 +1031,9 @@ static int sonic_decode_frame(AVCodecContext *avctx,
{
int x = ch;
+ if (c.overread > MAX_OVERREAD)
+ return AVERROR_INVALIDDATA;
+
predictor_init_state(s->predictor_k, s->predictor_state[ch], s->num_taps);
intlist_read(&c, state, s->coded_samples[ch], s->block_align, 1);