ffmpeg | branch: release/3.0 | Michael Niedermayer <michael@niedermayer.cc> | Mon Sep 26 20:25:59 2016 +0200| [e5bf7ab3e7c6432da47958105ac59ee2681d3198] | committer: Michael Niedermayer avcodec/ansi: Check dimensions Fixes: 1.avi Found-by: 连一汉 <lianyihan@360.cn> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 69449da436169e7facaa6d1f3bcbc41cf6ce2754) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e5bf7ab3e7c6432da4...
libavcodec/ansi.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/ansi.c b/libavcodec/ansi.c index 21d5ae1..98ea9e3 100644 --- a/libavcodec/ansi.c +++ b/libavcodec/ansi.c @@ -94,6 +94,9 @@ static av_cold int decode_init(AVCodecContext *avctx) int ret = ff_set_dimensions(avctx, 80 << 3, 25 << 4); if (ret < 0) return ret; + } else if (avctx->width % FONT_WIDTH || avctx->height % s->font_height) { + av_log(avctx, AV_LOG_ERROR, "Invalid dimensions %d %d\n", avctx->width, avctx->height); + return AVERROR(EINVAL); } return 0; }