aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2022-07-03 00:34:08 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2022-07-21 19:30:14 +0200
commit4e145f1dcdcbe19e8f8e98940dab04e9332a8b5b (patch)
treedc33a155eda619d96c2bc28042ee23c2d413e32e
parent8af798171bcc3109b9fae8f4556f5346a40b8955 (diff)
downloadffmpeg-4e145f1dcdcbe19e8f8e98940dab04e9332a8b5b.tar.gz
avcodec/mss4: Check image size with av_image_check_size2()
Fixes: Timeout Fixes: 48418/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MTS2_fuzzer-4834851466903552 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/mss4.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/mss4.c b/libavcodec/mss4.c
index d446e78d97..53b7910097 100644
--- a/libavcodec/mss4.c
+++ b/libavcodec/mss4.c
@@ -26,6 +26,7 @@
*/
#include "libavutil/thread.h"
+#include "libavutil/imgutils.h"
#include "avcodec.h"
#include "bytestream.h"
@@ -477,6 +478,9 @@ static int mss4_decode_frame(AVCodecContext *avctx, AVFrame *rframe,
width, height);
return AVERROR_INVALIDDATA;
}
+ if (av_image_check_size2(width, height, avctx->max_pixels, AV_PIX_FMT_NONE, 0, avctx) < 0)
+ return AVERROR_INVALIDDATA;
+
if (quality < 1 || quality > 100) {
av_log(avctx, AV_LOG_ERROR, "Invalid quality setting %d\n", quality);
return AVERROR_INVALIDDATA;