diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2021-09-28 00:25:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-09-29 19:52:10 +0200 |
| commit | 109113b54f6fa7b880f66c797f7ab49d65dc7167 (patch) | |
| tree | 944634164f457df9cb3bf3a7585f9d2838ed30c3 /libavcodec/siren.c | |
| parent | df163487d0a71d7f65f7602e4df6ab68e8fcc0fa (diff) | |
| download | ffmpeg-109113b54f6fa7b880f66c797f7ab49d65dc7167.tar.gz | |
avcodec/siren: Check available bits in decode_envelope()
Fixes: Timeout
Fixes: 39089/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MSNSIREN_fuzzer-6677219854909440
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Suggested-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/siren.c')
| -rw-r--r-- | libavcodec/siren.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/siren.c b/libavcodec/siren.c index 6909ebbf2e..6cbb3e3ba7 100644 --- a/libavcodec/siren.c +++ b/libavcodec/siren.c @@ -447,6 +447,8 @@ static int decode_envelope(SirenContext *s, GetBitContext *gb, int index = 0; do { + if (get_bits_left(gb) < 4) + return AVERROR_INVALIDDATA; index = differential_decoder_tree[i - 1][index][get_bits1(gb)]; } while (index > 0); @@ -724,9 +726,11 @@ static int siren_decode(AVCodecContext *avctx, void *data, skip_bits(gb, s->sample_rate_bits); - decode_envelope(s, gb, s->number_of_regions, + ret = decode_envelope(s, gb, s->number_of_regions, s->decoder_standard_deviation, s->absolute_region_power_index, s->esf_adjustment); + if (ret < 0) + return ret; rate_control = get_bits(gb, 4); |