diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2020-09-19 21:17:32 +0200 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-02-02 14:18:21 +0100 |
commit | 9514228b3db22b3a55a64dcb5fa615fd227ecbd6 (patch) | |
tree | 555a583f6cd4f0ffac16eb4c4dfffac3d1004fb4 | |
parent | 5e42ad856b735f455ba070c6d0e237dfed84fd65 (diff) | |
download | ffmpeg-9514228b3db22b3a55a64dcb5fa615fd227ecbd6.tar.gz |
avcodec/ansi: Check initial dimensions
Fixes: Timeout (minutes to less than 1sec)
Fixes: 25682/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ANSI_fuzzer-6320712032452608
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 949f0a6be974e4083f8e130c2d6870ef26f0eece)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r-- | libavcodec/ansi.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/ansi.c b/libavcodec/ansi.c index 272185230d..3a461eec26 100644 --- a/libavcodec/ansi.c +++ b/libavcodec/ansi.c @@ -475,6 +475,11 @@ static av_cold int decode_close(AVCodecContext *avctx) return 0; } +static const AVCodecDefault ansi_defaults[] = { + { "max_pixels", "640*480" }, + { NULL }, +}; + AVCodec ff_ansi_decoder = { .name = "ansi", .long_name = NULL_IF_CONFIG_SMALL("ASCII/ANSI art"), @@ -486,4 +491,5 @@ AVCodec ff_ansi_decoder = { .decode = decode_frame, .capabilities = AV_CODEC_CAP_DR1, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, + .defaults = ansi_defaults, }; |