From b3dab0f894d3ad3da48cec0876d3bd65c8773e9f Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 1 Dec 2018 22:16:19 +0100 Subject: [PATCH] avcodec/msvideo1: Check for too small dimensions Such low resolution would result in empty output as a minimum of 4x4 is needed We could also check for multiple of 4 dimensions but that is not needed Fixes: Timeout Fixes: 11191/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MSVIDEO1_fuzzer-5739529588178944 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer (cherry picked from commit 953bd58861ad933e614510140b05a61e3d1375be) Signed-off-by: Michael Niedermayer --- libavcodec/msvideo1.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/msvideo1.c b/libavcodec/msvideo1.c index c53ca826cb..3e51e3cfe9 100644 --- a/libavcodec/msvideo1.c +++ b/libavcodec/msvideo1.c @@ -63,6 +63,9 @@ static av_cold int msvideo1_decode_init(AVCodecContext *avctx) s->avctx = avctx; + if (avctx->width < 4 || avctx->height < 4) + return AVERROR_INVALIDDATA; + /* figure out the colorspace based on the presence of a palette */ if (s->avctx->bits_per_coded_sample == 8) { s->mode_8bit = 1;