diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-05-19 17:42:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-11-11 20:18:45 +0100 |
| commit | 551844116395733bef2dad0452741b7e6e436bd9 (patch) | |
| tree | 2f9c9f3800d48932446399d04e4ac49208c2586c /libavcodec | |
| parent | d239d1c43239e4e684e21b26b5b93a0ba2447904 (diff) | |
| download | ffmpeg-551844116395733bef2dad0452741b7e6e436bd9.tar.gz | |
avcodec/cpia: Check input size also against linesizes and EOL
Fixes: Timeout (14sec -> 29ms)
Fixes: 14733/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CPIA_fuzzer-5707022445576192
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Carl Eugen Hoyos <ceffmpeg@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 3c0bfa7d1a90a22d5fe8daa415cc689c111562f1)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/cpia.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/cpia.c b/libavcodec/cpia.c index 58833b2f26..f6d7332606 100644 --- a/libavcodec/cpia.c +++ b/libavcodec/cpia.c @@ -63,7 +63,7 @@ static int cpia_decode_frame(AVCodecContext *avctx, uint8_t *y, *u, *v, *y_end, *u_end, *v_end; // Check header - if ( avpkt->size < FRAME_HEADER_SIZE + if ( avpkt->size < FRAME_HEADER_SIZE + avctx->height * 3 || header[0] != MAGIC_0 || header[1] != MAGIC_1 || (header[17] != SUBSAMPLE_420 && header[17] != SUBSAMPLE_422) || (header[18] != YUVORDER_YUYV && header[18] != YUVORDER_UYVY) |