projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a3bf7b8
)
mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.
author
Alex Converse
<alex.converse@gmail.com>
Fri, 29 Jul 2011 22:27:36 +0000
(15:27 -0700)
committer
Alex Converse
<alex.converse@gmail.com>
Fri, 29 Jul 2011 23:03:53 +0000
(16:03 -0700)
This prevents out of bounds reads when extradata is being decoded.
libavformat/mxfdec.c
patch
|
blob
|
history
diff --git
a/libavformat/mxfdec.c
b/libavformat/mxfdec.c
index e2688b1bff9f7b714df9e78655f73402883696fb..8906bdd78f9a904af2d38a138da0ae76ef02cf5b 100644
(file)
--- a/
libavformat/mxfdec.c
+++ b/
libavformat/mxfdec.c
@@
-600,7
+600,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;