From: Michael Niedermayer <michaelni@gmx.at>
Date: Sat, 14 Apr 2012 11:13:32 +0000 (+0200)
Subject: wmaprodec: check min_samples_per_subframe
X-Git-Tag: android-x86-4.4-r1~12417
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9166f483c52e7e0a031a7bb149bea16aaa72f344;p=android-x86%2Fexternal-ffmpeg.git

wmaprodec: check min_samples_per_subframe

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

diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c
index aa068264bd..8e7ef4cabd 100644
--- a/libavcodec/wmaprodec.c
+++ b/libavcodec/wmaprodec.c
@@ -335,6 +335,12 @@ static av_cold int decode_init(AVCodecContext *avctx)
         return AVERROR_INVALIDDATA;
     }
 
+    if (s->min_samples_per_subframe < (1<<WMAPRO_BLOCK_MIN_BITS)) {
+        av_log(avctx, AV_LOG_ERROR, "min_samples_per_subframe of %d too small\n",
+               s->min_samples_per_subframe);
+        return AVERROR_INVALIDDATA;
+    }
+
     s->num_channels = avctx->channels;
 
     if (s->num_channels < 0) {