ape: provide two additional bytes in buffer for old MAC versions
authorKostya Shishkov <kostya.shishkov@gmail.com>
Tue, 12 Mar 2013 06:17:03 +0000 (07:17 +0100)
committerKostya Shishkov <kostya.shishkov@gmail.com>
Fri, 15 Mar 2013 08:50:42 +0000 (09:50 +0100)
Range coder in 3.90-3.95 overread two bytes in the final normalize.

libavcodec/apedec.c

index 0bef457..d4a3dcf 100644 (file)
@@ -917,11 +917,13 @@ static int ape_decode_frame(AVCodecContext *avctx, void *data,
             av_log(avctx, AV_LOG_WARNING, "packet size is not a multiple of 4. "
                    "extra bytes at the end will be skipped.\n");
         }
-
+        if (s->fileversion < 3950) // previous versions overread two bytes
+            buf_size += 2;
         av_fast_malloc(&s->data, &s->data_size, buf_size);
         if (!s->data)
             return AVERROR(ENOMEM);
         s->dsp.bswap_buf((uint32_t*)s->data, (const uint32_t*)buf, buf_size >> 2);
+        memset(s->data + (buf_size & ~3), 0, buf_size & 3);
         s->ptr = s->data;
         s->data_end = s->data + buf_size;