[FFmpeg-cvslog] r16229 - trunk/libavformat/matroskadec.c

[astrange]

Author: astrange
Date: Fri Dec 19 02:00:44 2008
New Revision: 16229

Log:
Allocate and clear FF_INPUT_BUFFER_PADDING bytes at the end of mkv extradata.

Fixes valgrind invalid read warnings during H.264 extradata parsing.


Modified:
   trunk/libavformat/matroskadec.c

Modified: trunk/libavformat/matroskadec.c
==============================================================================
--- trunk/libavformat/matroskadec.c	(original)
+++ trunk/libavformat/matroskadec.c	Fri Dec 19 02:00:44 2008
@@ -1304,7 +1304,8 @@ static int matroska_read_header(AVFormat
             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;