From c7f95d2bd938b440f1d9310ce4785a28dcb44a09 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 1 May 2019 20:12:12 +0200 Subject: [PATCH] avcodec/fic: Check input size against minimal frame size Fixes: Timeout (22sec ->54ms) Fixes: 14439/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FIC_fuzzer-5660988231122944 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/fic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/fic.c b/libavcodec/fic.c index 65d102b86be..540078eda12 100644 --- a/libavcodec/fic.c +++ b/libavcodec/fic.c @@ -356,7 +356,7 @@ static int fic_decode_frame(AVCodecContext *avctx, void *data, sdata = src + tsize + FIC_HEADER_SIZE + 4 * nslices; msize = avpkt->size - nslices * 4 - tsize - FIC_HEADER_SIZE; - if (msize <= 0) { + if (msize <= ctx->aligned_width/8 * (ctx->aligned_height/8) / 8) { av_log(avctx, AV_LOG_ERROR, "Not enough frame data to decode.\n"); return AVERROR_INVALIDDATA; } -- 2.39.2