Module: libav Branch: release/0.6 Commit: e07086d8aed011544ee2fc71ebab867a38a6d6e7
Author: Alex Converse <[email protected]> Committer: Reinhard Tartler <[email protected]> Date: Fri Jul 29 15:27:36 2011 -0700 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 <[email protected]> Signed-off-by: Reinhard Tartler <[email protected]> --- libavformat/mxfdec.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 168fd8d..a601007 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -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; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
