From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 28 Mar 2012 08:30:44 +0000 (+0200)
Subject: apedec: fix global array overread
X-Git-Tag: android-x86-4.4-r1~12700
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8db2935db0caa8efbef009994920ef6a20289496;p=android-x86%2Fexternal-ffmpeg.git

apedec: fix global array overread

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---

diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c
index 907f45faff..4d0801b708 100644
--- a/libavcodec/apedec.c
+++ b/libavcodec/apedec.c
@@ -217,7 +217,7 @@ static av_cold int ape_decode_init(AVCodecContext *avctx)
 
     av_log(avctx, AV_LOG_DEBUG, "Compression Level: %d - Flags: %d\n",
            s->compression_level, s->flags);
-    if (s->compression_level % 1000 || s->compression_level > COMPRESSION_LEVEL_INSANE) {
+    if (s->compression_level % 1000 || s->compression_level > COMPRESSION_LEVEL_INSANE || !s->compression_level) {
         av_log(avctx, AV_LOG_ERROR, "Incorrect compression level %d\n",
                s->compression_level);
         return AVERROR_INVALIDDATA;