diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-02-27 15:17:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-06-18 01:16:03 +0200 |
| commit | 46ed4d52825379fcb43d830ac16da9827738ea61 (patch) | |
| tree | 3ee8d5cfe3e63416d624d445319f2c1c62973c95 | |
| parent | 031206032960dbfe399f0925e8ddc8c73bd89df1 (diff) | |
| download | ffmpeg-46ed4d52825379fcb43d830ac16da9827738ea61.tar.gz | |
avcodec/nuv: rtjpeg with dimensions less than 16 would result in no decoded pixels thus reject it
Fixes: Timeout
Fixes: 6297/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_NUV_fuzzer-4882404863901696
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 939440ad1aa820bed51f54d273b4fa6c5016d9f9)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/nuv.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c index 8d806dbbff..32ed65899b 100644 --- a/libavcodec/nuv.c +++ b/libavcodec/nuv.c @@ -199,6 +199,9 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, case NUV_RTJPEG_IN_LZO: case NUV_RTJPEG: keyframe = !buf[2]; + if (c->width < 16 || c->height < 16) { + return AVERROR_INVALIDDATA; + } break; case NUV_COPY_LAST: keyframe = 0; |