Hi,
patch attached.
From 125cca58e8c29f376dac293227bd8e395d164687 Mon Sep 17 00:00:00 2001
From: Paul B Mahol <one...@gmail.com>
Date: Sat, 9 Apr 2016 15:57:41 +0200
Subject: [PATCH] avcodec/shorten: fix decoding of very large (>2048) block
sizes
Signed-off-by: Paul B Mahol <one...@gmail.com>
---
libavcodec/shorten.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c
index 064870c..d1a6ec1 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 = 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;
}
--
2.5.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
