diff options
| author | Paul B Mahol <onemda@gmail.com> | 2016-04-09 15:57:41 +0200 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2016-04-09 19:51:16 +0200 |
| commit | 82ee37f1f3b9fe08e149e2aedfc800dab3e7aab8 (patch) | |
| tree | 79212f069e60d57ec7b56dd3c57735c281a706e6 /libavcodec | |
| parent | b0c026a27f9498b8f118684a2830ca7df7eae374 (diff) | |
| download | ffmpeg-82ee37f1f3b9fe08e149e2aedfc800dab3e7aab8.tar.gz | |
avcodec/shorten: fix decoding of very large (>2048) block sizes
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/shorten.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c index 0dc879a58c..fefe4708a5 100644 --- a/libavcodec/shorten.c +++ b/libavcodec/shorten.c @@ -474,9 +474,23 @@ static int shorten_decode_frame(AVCodecContext *avctx, void *data, /* process header or next subblock */ if (!s->got_header) { + if ((ret = read_header(s)) < 0) return ret; + if (avpkt->size) { + int max_framesize; + void *tmp_ptr; + + max_framesize = FFMAX(s->max_framesize, s->blocksize * s->channels * 2); + tmp_ptr = av_fast_realloc(s->bitstream, &s->allocated_bitstream_size, + max_framesize + AV_INPUT_BUFFER_PADDING_SIZE); + if (!tmp_ptr) { + av_log(avctx, AV_LOG_ERROR, "error allocating bitstream buffer\n"); + return AVERROR(ENOMEM); + } + s->bitstream = tmp_ptr; + s->max_framesize = max_framesize; *got_frame_ptr = 0; goto finish_frame; } |