[FFmpeg-cvslog] mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.

Alex Converse git at videolan.org
Thu Sep 22 01:17:23 CEST 2011


ffmpeg | branch: release/0.8 | Alex Converse <alex.converse at gmail.com> | Fri Jul 29 15:27:36 2011 -0700| [c5388d680e62db36ab235b5076d3b0c1eb5a04f4] | committer: Anton Khirnov

mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.

This prevents out of bounds reads when extradata is being decoded.
(cherry picked from commit 1f6f58d5855288492fc2640a9f1035c01c75d356)

Signed-off-by: Anton Khirnov <anton at khirnov.net>

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

 libavformat/mxfdec.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index 82daa2a..fcee7a7 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -599,7 +599,7 @@ static int mxf_read_generic_descriptor(void *arg, AVIOContext *pb, int tag, int
     default:
         /* Private uid used by SONY C0023S01.mxf */
         if (IS_KLV_KEY(uid, mxf_sony_mpeg4_extradata)) {
-            descriptor->extradata = av_malloc(size);
+            descriptor->extradata = av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE);
             if (!descriptor->extradata)
                 return -1;
             descriptor->extradata_size = size;



More information about the ffmpeg-cvslog mailing list