diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2022-07-03 00:34:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2022-09-25 13:51:49 +0200 |
| commit | ff6d408ac0370058a6d0e039881eef02b0b122d0 (patch) | |
| tree | 8f6dabd7097e14ee295e6fbc3c9ed9fa29fa98e4 /libavcodec/mss4.c | |
| parent | 815efd3f689375efb889233933505198dcf7f750 (diff) | |
| download | ffmpeg-ff6d408ac0370058a6d0e039881eef02b0b122d0.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>
Diffstat (limited to 'libavcodec/mss4.c')
| -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 7f11f30dc8..4ad653c443 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" @@ -476,6 +477,9 @@ static int mss4_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, 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; |