diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2022-07-03 00:34:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2022-07-22 17:16:52 +0200 |
| commit | fa511b03d3a7d02e4c6bd1e17d12eac2d71fd03c (patch) | |
| tree | 13233c86479f1253b33624b4caed41bdd06128e5 | |
| parent | 5767941df88e75b2c2020e42580abc92478842e2 (diff) | |
| download | ffmpeg-fa511b03d3a7d02e4c6bd1e17d12eac2d71fd03c.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>
(cherry picked from commit 4e145f1dcdcbe19e8f8e98940dab04e9332a8b5b)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/mss4.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/mss4.c b/libavcodec/mss4.c index 9f3c4a593d..43eb1025aa 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; |