diff options
| author | Michael Niedermayer <[email protected]> | 2019-05-19 17:42:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2019-11-14 23:30:37 +0100 |
| commit | 0ecde06ee746ca3b785cd200e0af0485b03cf922 (patch) | |
| tree | 44614eb83a71bc145b3f0ef29ed516bcd5721d31 | |
| parent | 900c0ecaedfed4670cb5f8c4719988557ccbad39 (diff) | |
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 <[email protected]>
Signed-off-by: Michael Niedermayer <[email protected]>
(cherry picked from commit 3c0bfa7d1a90a22d5fe8daa415cc689c111562f1)
Signed-off-by: Michael Niedermayer <[email protected]>
| -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) |