[FFmpeg-cvslog] avcodec/ansi: Check dimensions

Michael Niedermayer git at videolan.org
Wed Sep 28 15:50:14 EEST 2016


ffmpeg | branch: release/3.1 | Michael Niedermayer <michael at niedermayer.cc> | Mon Sep 26 20:25:59 2016 +0200| [496267f8e9ec218351e4359e1fde48722d4fc804] | committer: Michael Niedermayer

avcodec/ansi: Check dimensions

Fixes: 1.avi

Found-by: 连一汉 <lianyihan at 360.cn>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 69449da436169e7facaa6d1f3bcbc41cf6ce2754)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=496267f8e9ec218351e4359e1fde48722d4fc804
---

 libavcodec/ansi.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/ansi.c b/libavcodec/ansi.c
index 4808ea7..19c88d8 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;
 }



More information about the ffmpeg-cvslog mailing list