From: Laurent Aimar <fenrir@videolan.org>
Date: Sat, 17 Sep 2011 14:56:35 +0000 (+0200)
Subject: Fix js_vlc_bits value validation when joint stereo is used in cook decoder.
X-Git-Tag: android-x86-4.4-r1~16159
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=352c878de6fca57a3f2a6369e27ca442fa5f9518;p=android-x86%2Fexternal-ffmpeg.git

Fix js_vlc_bits value validation when joint stereo is used in cook decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---

diff --git a/libavcodec/cook.c b/libavcodec/cook.c
index 6def1ac2f7..0d09bb83fb 100644
--- a/libavcodec/cook.c
+++ b/libavcodec/cook.c
@@ -1174,8 +1174,9 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
             return -1;
         }
 
-        if ((q->subpacket[s].js_vlc_bits > 6) || (q->subpacket[s].js_vlc_bits < 0)) {
-            av_log(avctx,AV_LOG_ERROR,"js_vlc_bits = %d, only >= 0 and <= 6 allowed!\n",q->subpacket[s].js_vlc_bits);
+        if ((q->subpacket[s].js_vlc_bits > 6) || (q->subpacket[s].js_vlc_bits < 2*q->subpacket[s].joint_stereo)) {
+            av_log(avctx,AV_LOG_ERROR,"js_vlc_bits = %d, only >= %d and <= 6 allowed!\n",
+                   q->subpacket[s].js_vlc_bits, 2*q->subpacket[s].joint_stereo);
             return -1;
         }