[FFmpeg-cvslog] avformat/takdec: zero padding area before use

Michael Niedermayer git at videolan.org
Tue Jan 7 20:06:02 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan  7 19:47:37 2014 +0100| [243b9fea90aade8cf8197fb8f362ccc03c7f6295] | committer: Michael Niedermayer

avformat/takdec: zero padding area before use

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7fcecee73d71_6470_luckynight-partial.tak
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=243b9fea90aade8cf8197fb8f362ccc03c7f6295
---

 libavformat/takdec.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavformat/takdec.c b/libavformat/takdec.c
index 2ed8a1e..4888a77 100644
--- a/libavformat/takdec.c
+++ b/libavformat/takdec.c
@@ -85,6 +85,7 @@ static int tak_read_header(AVFormatContext *s)
             buffer = av_malloc(size - 3 + FF_INPUT_BUFFER_PADDING_SIZE);
             if (!buffer)
                 return AVERROR(ENOMEM);
+            memset(buffer + size - 3, 0, FF_INPUT_BUFFER_PADDING_SIZE);
 
             ffio_init_checksum(pb, tak_check_crc, 0xCE04B7U);
             if (avio_read(pb, buffer, size - 3) != size - 3) {



More information about the ffmpeg-cvslog mailing list