diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-08-04 23:45:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-10-28 02:22:42 +0200 |
| commit | 007da8396fedde3a3fb8c99cb7c7aaa46cdec1c9 (patch) | |
| tree | e6dc3480c9425b68bec17501138bc318a6e3ddd9 | |
| parent | e3cc5e81ab00f8b7a8ca230cd4cdba28443a39ef (diff) | |
| download | ffmpeg-007da8396fedde3a3fb8c99cb7c7aaa46cdec1c9.tar.gz | |
avcodec/scpr: Check for min > max in decompress_p()
Fixes: Timeout
Fixes: 9342/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SCPR_fuzzer-4795990841229312
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 3378194ce8e9a126a7cc6ed57bedde1221790469)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/scpr.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/scpr.c b/libavcodec/scpr.c index ad6073dbf0..66b4157576 100644 --- a/libavcodec/scpr.c +++ b/libavcodec/scpr.c @@ -522,6 +522,9 @@ static int decompress_p(AVCodecContext *avctx, return ret; max += temp << 8; + if (min > max) + return AVERROR_INVALIDDATA; + memset(s->blocks, 0, sizeof(*s->blocks) * s->nbcount); while (min <= max) { |