[FFmpeg-cvslog] avcodec/binkaudio: clear padding area of packet_buffer

Michael Niedermayer git at videolan.org
Wed Jan 1 03:40:20 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jan  1 03:30:16 2014 +0100| [07728a111583be6865b7ce2adea705af9d207588] | committer: Michael Niedermayer

avcodec/binkaudio: clear padding area of packet_buffer

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f0dba198b34_2970_Snd0a3a2ad4.dee
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/binkaudio.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c
index 8db4533..ffa32d1 100644
--- a/libavcodec/binkaudio.c
+++ b/libavcodec/binkaudio.c
@@ -306,6 +306,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
         buf = av_realloc(s->packet_buffer, avpkt->size + FF_INPUT_BUFFER_PADDING_SIZE);
         if (!buf)
             return AVERROR(ENOMEM);
+        memset(buf + avpkt->size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
         s->packet_buffer = buf;
         memcpy(s->packet_buffer, avpkt->data, avpkt->size);
         if ((ret = init_get_bits8(gb, s->packet_buffer, avpkt->size)) < 0)



More information about the ffmpeg-cvslog mailing list