diff mbox series

[FFmpeg-devel,1/3] avcodec/siren: Check available bits at frame start

Message ID 20210928222835.29462-1-michael@niedermayer.cc
State New
Headers show
Series [FFmpeg-devel,1/3] avcodec/siren: Check available bits at frame start | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished

Commit Message

Michael Niedermayer Sept. 28, 2021, 10:28 p.m. UTC 
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: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/siren.c | 3 +++
 1 file changed, 3 insertions(+)
diff mbox series

Patch

diff --git a/libavcodec/siren.c b/libavcodec/siren.c
index 6909ebbf2e6..7f084172a4c 100644
--- a/libavcodec/siren.c
+++ b/libavcodec/siren.c
@@ -722,6 +722,9 @@  static int siren_decode(AVCodecContext *avctx, void *data,
     if ((ret = init_get_bits8(gb, avpkt->data, avpkt->size)) < 0)
         return ret;
 
+    if (s->sample_rate_bits + s->number_of_regions + 4 + s->checksum_bits > get_bits_left(gb))
+        return AVERROR_INVALIDDATA;
+
     skip_bits(gb, s->sample_rate_bits);
 
     decode_envelope(s, gb, s->number_of_regions,