diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-11-02 14:14:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-12-01 17:47:53 +0100 |
| commit | 9162df98e1cf4e240f36944def19e8cd2cc28359 (patch) | |
| tree | 73fd9a17917744569d36d0b5fffb1af2008e91c4 | |
| parent | 66e701af697da60553f2252ab617081b11672854 (diff) | |
| download | ffmpeg-9162df98e1cf4e240f36944def19e8cd2cc28359.tar.gz | |
avcodec/nuv: Move comptype check up
Fixes: Timeout (23sec -> 5ms)
Fixes: 18517/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_NUV_fuzzer-5753135536013312
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 1138cdecbe0164ab1f07768418e794fddfdc636d)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/nuv.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c index 32ed65899b..6192a70c74 100644 --- a/libavcodec/nuv.c +++ b/libavcodec/nuv.c @@ -217,6 +217,14 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, case NUV_RTJPEG: minsize = c->width/16 * (c->height/16) * 6; break; + case NUV_BLACK: + case NUV_COPY_LAST: + case NUV_LZO: + case NUV_RTJPEG_IN_LZO: + break; + default: + av_log(avctx, AV_LOG_ERROR, "unknown compression\n"); + return AVERROR_INVALIDDATA; } if (buf_size < minsize / 4) return AVERROR_INVALIDDATA; @@ -305,9 +313,6 @@ retry: case NUV_COPY_LAST: /* nothing more to do here */ break; - default: - av_log(avctx, AV_LOG_ERROR, "unknown compression\n"); - return AVERROR_INVALIDDATA; } if ((result = av_frame_ref(picture, c->pic)) < 0) |