avcodec/shorten: fix decoding of very large (>2048) block sizes
authorPaul B Mahol <onemda@gmail.com>
Sat, 9 Apr 2016 13:57:41 +0000 (15:57 +0200)
committerPaul B Mahol <onemda@gmail.com>
Sat, 9 Apr 2016 17:51:16 +0000 (19:51 +0200)
Signed-off-by: Paul B Mahol <onemda@gmail.com>
libavcodec/shorten.c

index 0dc879a..fefe470 100644 (file)
@@ -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;
         }