diff options
| author | Alexander Strange <astrange@ithinksw.com> | 2008-12-19 01:00:44 +0000 |
|---|---|---|
| committer | Alexander Strange <astrange@ithinksw.com> | 2008-12-19 01:00:44 +0000 |
| commit | 1ca610c0152f31847ab760fda1fb147692f31e7e (patch) | |
| tree | fa4925effced5d63fd384bcb6b035c2c5f888654 /libavformat | |
| parent | 712ca84c21a4d7faf97fa79732bf5c347ec6fbc3 (diff) | |
| download | ffmpeg-1ca610c0152f31847ab760fda1fb147692f31e7e.tar.gz | |
Allocate and clear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of mkv
extradata.
Fixes valgrind invalid read warnings during H.264 extradata parsing.
Originally committed as revision 16229 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/matroskadec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 5a79712f05..6478d8484a 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1304,7 +1304,8 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap) st->codec->extradata = extradata; st->codec->extradata_size = extradata_size; } else if(track->codec_priv.data && track->codec_priv.size > 0){ - st->codec->extradata = av_malloc(track->codec_priv.size); + st->codec->extradata = av_mallocz(track->codec_priv.size + + FF_INPUT_BUFFER_PADDING_SIZE); if(st->codec->extradata == NULL) return AVERROR(ENOMEM); st->codec->extradata_size = track->codec_priv.size; |