[FFmpeg-cvslog] bintext: fix possible x variable overflow.

Michael Niedermayer git at videolan.org
Fri Sep 16 06:14:16 CEST 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep 16 05:31:15 2011 +0200| [b9dbaa409f51545a840929665fa0303b46e7e8a5] | committer: Michael Niedermayer

bintext: fix possible x variable overflow.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/bintext.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavcodec/bintext.c b/libavcodec/bintext.c
index a4467b3..e63d3d9 100644
--- a/libavcodec/bintext.c
+++ b/libavcodec/bintext.c
@@ -116,7 +116,7 @@ static void draw_char(AVCodecContext *avctx, int c, int a)
                     s->frame.linesize[0], s->font, s->font_height, c,
                     a & 0x0F, a >> 4);
     s->x += FONT_WIDTH;
-    if (s->x >= avctx->width) {
+    if (s->x > avctx->width - FONT_WIDTH) {
         s->x = 0;
         s->y += s->font_height;
     }



More information about the ffmpeg-cvslog mailing list