mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.
authorAlex Converse <alex.converse@gmail.com>
Fri, 29 Jul 2011 22:27:36 +0000 (15:27 -0700)
committerReinhard Tartler <siretart@tauware.de>
Sat, 5 Nov 2011 12:18:32 +0000 (13:18 +0100)
This prevents out of bounds reads when extradata is being decoded.
(cherry picked from commit 1f6f58d5855288492fc2640a9f1035c01c75d356)

Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
libavformat/mxfdec.c

index 168fd8d..a601007 100644 (file)
@@ -592,7 +592,7 @@ static int mxf_read_generic_descriptor(MXFDescriptor *descriptor, ByteIOContext
     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;