From 6a697b42d0c8469c05e2a1a0920d8539ba7b068d Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 3 Oct 2012 16:06:23 +0200 Subject: [PATCH] parser: fix large overreads Signed-off-by: Michael Niedermayer --- libavcodec/parser.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/parser.c b/libavcodec/parser.c index a85db1a02f..127ba8bd3d 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -261,6 +261,7 @@ int ff_combine_frame(ParseContext *pc, int next, const uint8_t **buf, int *buf_s if(!new_buffer) return AVERROR(ENOMEM); pc->buffer = new_buffer; + if(FF_INPUT_BUFFER_PADDING_SIZE > -next) memcpy(&pc->buffer[pc->index], *buf, next + FF_INPUT_BUFFER_PADDING_SIZE ); pc->index = 0; *buf= pc->buffer;