Commit 82ee37f1 authored by Paul B Mahol's avatar Paul B Mahol

avcodec/shorten: fix decoding of very large (>2048) block sizes

Signed-off-by: 's avatarPaul B Mahol <onemda@gmail.com>
parent b0c026a2
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment