diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-09-27 18:02:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-12-06 20:30:57 +0100 |
| commit | 68a8bdf5f1985fa6b0d952bbba82374b4e1f9e8f (patch) | |
| tree | 3bf209660190fbb74c270f49b2459a05ed741bc5 | |
| parent | dad5ed01a82abdcd6c71e4345c2d5dc7c55b5730 (diff) | |
| download | ffmpeg-68a8bdf5f1985fa6b0d952bbba82374b4e1f9e8f.tar.gz | |
avcodec/adpcm: Check initial predictor for ADPCM_IMA_EA_EACS
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>
(cherry picked from commit 2f66e8436d89963362acf533a60ed4fedb42546e)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/adpcm.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index de79a89c4e..4c3a3a3f23 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -1064,8 +1064,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); |