[FFmpeg-cvslog] ansi: fix possible use of uninitialized variables
Vittorio Giovara
git at videolan.org
Sun Nov 3 13:07:47 CET 2013
ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Sun Oct 27 18:14:02 2013 +0100| [3ea5f64ffff0a51f62922efd2e2bc231b13b2179] | committer: Vittorio Giovara
ansi: fix possible use of uninitialized variables
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3ea5f64ffff0a51f62922efd2e2bc231b13b2179
---
libavcodec/ansi.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/libavcodec/ansi.c b/libavcodec/ansi.c
index 3f30ae9..95b5be4 100644
--- a/libavcodec/ansi.c
+++ b/libavcodec/ansi.c
@@ -165,7 +165,10 @@ static void draw_char(AVCodecContext *avctx, int c)
static int execute_code(AVCodecContext * avctx, int c)
{
AnsiContext *s = avctx->priv_data;
- int ret, i, width, height;
+ int ret, i;
+ int width = 0;
+ int height = 0;
+
switch(c) {
case 'A': //Cursor Up
s->y = FFMAX(s->y - (s->nb_args > 0 ? s->args[0]*s->font_height : s->font_height), 0);
@@ -224,7 +227,8 @@ static int execute_code(AVCodecContext * avctx, int c)
default:
avpriv_request_sample(avctx, "Unsupported screen mode");
}
- if (width != avctx->width || height != avctx->height) {
+ if (width != 0 && height != 0 &&
+ (width != avctx->width || height != avctx->height)) {
av_frame_unref(s->frame);
ret = ff_set_dimensions(avctx, width, height);
if (ret < 0)
More information about the ffmpeg-cvslog
mailing list