diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-07-28 22:29:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-07-01 12:11:55 +0200 |
| commit | 03ffaebe9479775e8e1c41109747f48af721626f (patch) | |
| tree | 06b7bc2d3767510f4754ec4d5386e9b19d300f03 | |
| parent | f4c653c3877383b70401a025c2711485316a1964 (diff) | |
| download | ffmpeg-03ffaebe9479775e8e1c41109747f48af721626f.tar.gz | |
avcodec/eatqi: Check for minimum frame size
The minimum header is 8 bytes, the smallest bitstream that is passed to
the MB decode code is 4 bytes
Fixes: Timeout (35sec -> 18sec)
Fixes: 15800/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EATQI_fuzzer-5684154517159936
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 5ffb8e879389fb0642654e3233cfeca1f9841e52)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/eatqi.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/eatqi.c b/libavcodec/eatqi.c index 92b23d009c..268d174bd3 100644 --- a/libavcodec/eatqi.c +++ b/libavcodec/eatqi.c @@ -131,6 +131,9 @@ static int tqi_decode_frame(AVCodecContext *avctx, AVFrame *frame = data; int ret, w, h; + if (buf_size < 12) + return AVERROR_INVALIDDATA; + t->avctx = avctx; w = AV_RL16(&buf[0]); |