mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-04 23:38:20 +02:00
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>
This commit is contained in:
parent
df163487d0
commit
109113b54f
@ -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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user