[FFmpeg-devel,09/11] avcodec/adpcm: Check initial predictor for ADPCM_IMA_EA_EACS

Submitted by Michael Niedermayer on Sept. 27, 2019, 5:23 p.m.

Details

Message ID 20190927172350.2095-9-michael@niedermayer.cc
State Accepted
Commit 2f66e8436d89963362acf533a60ed4fedb42546e
Headers show

Commit Message

Michael Niedermayer Sept. 27, 2019, 5:23 p.m.
Fixes: signed integer overflow: -2147483360 - 631 cannot be represented in type 'int'
Fixes: 17701/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ADPCM_IMA_EA_EACS_fuzzer-5711517319692288

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

Patch hide | download patch | download mbox

diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index 8ed2b6c9d9..a8e74522b3 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -1231,8 +1231,11 @@  static int adpcm_decode_frame(AVCodecContext *avctx, void *data,
                 return AVERROR_INVALIDDATA;
             }
         }
-        for (i=0; i<=st; i++)
+        for (i=0; i<=st; i++) {
             c->status[i].predictor  = bytestream2_get_le32u(&gb);
+            if (FFABS(c->status[i].predictor) > (1<<16))
+                return AVERROR_INVALIDDATA;
+        }
 
         for (n = nb_samples >> (1 - st); n > 0; n--) {
             int byte   = bytestream2_get_byteu(&gb);