diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-28 13:30:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-06-02 01:14:38 +0200 |
| commit | 3e18f0fddde8fe1b89c1af63874d60a4862b29be (patch) | |
| tree | e228b37a785e9926c9699a1ee39515e24e478054 | |
| parent | b330fec1ced7e967f9025e4131f9c29bfa00d3f6 (diff) | |
| download | ffmpeg-3e18f0fddde8fe1b89c1af63874d60a4862b29be.tar.gz | |
avcodec/sheervideo: Check input buffer size before allocating and decoding
Fixes: Timeout
Fixes: 1858/clusterfuzz-testcase-minimized-6450473802399744
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 d8030c14bd7ac983b81ebe898631979f6b5aea09)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/sheervideo.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/sheervideo.c b/libavcodec/sheervideo.c index 092ac6ed82..6f99b5c869 100644 --- a/libavcodec/sheervideo.c +++ b/libavcodec/sheervideo.c @@ -3105,6 +3105,11 @@ static int decode_frame(AVCodecContext *avctx, return AVERROR_PATCHWELCOME; } + if (avpkt->size < 20 + avctx->width * avctx->height / 16) { + av_log(avctx, AV_LOG_ERROR, "Input packet too small\n"); + return AVERROR_INVALIDDATA; + } + if (s->format != format) { if (ret < 0) return ret; |