From 42b6805cc1989f759f19e9d253527311741cbd3a Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 27 Dec 2013 00:23:10 +0100 Subject: [PATCH] avcodec/huffyuvdec: clear remainder of the array on end of input in decode_422_bitstream() Fixes: msan_uninit-mem_7f909423efcd_9923_yuv_predmed.avi Fixes use of uninitialized memory Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer --- libavcodec/huffyuvdec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/huffyuvdec.c b/libavcodec/huffyuvdec.c index 3cfda9b767..cbb41facb8 100644 --- a/libavcodec/huffyuvdec.c +++ b/libavcodec/huffyuvdec.c @@ -406,6 +406,9 @@ static void decode_422_bitstream(HYuvContext *s, int count) READ_2PIX(s->temp[0][2 * i ], s->temp[1][i], 1); READ_2PIX(s->temp[0][2 * i + 1], s->temp[2][i], 2); } + for (; i < count; i++) + s->temp[0][2 * i ] = s->temp[1][i] = + s->temp[0][2 * i + 1] = s->temp[2][i] = 128; } else { for (i = 0; i < count; i++) { READ_2PIX(s->temp[0][2 * i ], s->temp[1][i], 1);