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

Michael Niedermayer michael at niedermayer.cc
Wed Sep 29 01:28:33 EEST 2021


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 at xvid.org>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
---
 libavcodec/siren.c | 3 +++
 1 file changed, 3 insertions(+)

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,
-- 
2.17.1



More information about the ffmpeg-devel mailing list