diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-11-28 13:54:35 +0400 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2014-02-05 00:59:57 +0400 |
| commit | 1713eec29add37b654ec6bf262b843d139c1ffc6 (patch) | |
| tree | f628e997565662e889c92c5a1285252fd294a3de /libavcodec/shorten.c | |
| parent | 5430839144c6da0160e8e0cfb0c8db01de432e94 (diff) | |
shorten: pad the internal bitstream buffer
Fixes invalid reads.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
Diffstat (limited to 'libavcodec/shorten.c')
| -rw-r--r-- | libavcodec/shorten.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c index 992e01b44c..c465fffe05 100644 --- a/libavcodec/shorten.c +++ b/libavcodec/shorten.c @@ -431,7 +431,7 @@ static int shorten_decode_frame(AVCodecContext *avctx, void *data, void *tmp_ptr; s->max_framesize = 1024; // should hopefully be enough for the first header tmp_ptr = av_fast_realloc(s->bitstream, &s->allocated_bitstream_size, - s->max_framesize); + s->max_framesize + FF_INPUT_BUFFER_PADDING_SIZE); if (!tmp_ptr) { av_log(avctx, AV_LOG_ERROR, "error allocating bitstream buffer\n"); return AVERROR(ENOMEM); |