[FFmpeg-devel,4/4] avcodec/alsdec: Check that input space for header exists in read_diff_float_data()

Submitted by Michael Niedermayer on Oct. 4, 2019, 5:59 p.m.

Details

Message ID 20191004175942.14310-4-michael@niedermayer.cc
State New
Headers show

Commit Message

Michael Niedermayer Oct. 4, 2019, 5:59 p.m.
Fixes: Timeout (21sec -> 8sec)
Fixes: 17832/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ALS_fuzzer-5737092172218368

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/alsdec.c | 3 +++
 1 file changed, 3 insertions(+)

Patch hide | download patch | download mbox

diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c
index fafc3a757b..4bc0e2bd84 100644
--- a/libavcodec/alsdec.c
+++ b/libavcodec/alsdec.c
@@ -1475,6 +1475,9 @@  static int read_diff_float_data(ALSDecContext *ctx, unsigned int ra_frame) {
         ff_mlz_flush_dict(ctx->mlz);
     }
 
+    if (avctx->channels * 8 > get_bits_left(gb))
+        return AVERROR_INVALIDDATA;
+
     for (c = 0; c < avctx->channels; ++c) {
         if (use_acf) {
             //acf_flag