[FFmpeg-cvslog] avcodec/mpeg4videodec: use av_fast_padded_malloc() for bitstream buffer

Michael Niedermayer git at videolan.org
Tue Jan 7 01:35:34 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan  7 01:27:23 2014 +0100| [21b25537fb8f77b098575e90d8b24556451badf3] | committer: Michael Niedermayer

avcodec/mpeg4videodec: use av_fast_padded_malloc() for bitstream buffer

Fixes use of uninitialized memory with vlc (sample from ticket3277)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=21b25537fb8f77b098575e90d8b24556451badf3
---

 libavcodec/mpeg4videodec.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index 34ec2b3..1771e71 100644
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -2653,10 +2653,9 @@ int ff_mpeg4_frame_end(AVCodecContext *avctx, const uint8_t *buf, int buf_size)
         }
 
         if (startcode_found) {
-            av_fast_malloc(&s->bitstream_buffer,
+            av_fast_padded_malloc(&s->bitstream_buffer,
                            &s->allocated_bitstream_buffer_size,
-                           buf_size - current_pos +
-                           FF_INPUT_BUFFER_PADDING_SIZE);
+                           buf_size - current_pos);
             if (!s->bitstream_buffer)
                 return AVERROR(ENOMEM);
             memcpy(s->bitstream_buffer, buf + current_pos,



More information about the ffmpeg-cvslog mailing list