From: Michael Niedermayer <michaelni@gmx.at>
Date: Tue, 27 Mar 2012 11:49:58 +0000 (+0200)
Subject: alsdec: make sure no invalid opt_order stays in the context.
X-Git-Tag: android-x86-4.4-r1~12719
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=dfacef9e735461e72a05e683da06bda5ea9c5d8e;p=android-x86%2Fexternal-ffmpeg.git

alsdec: make sure no invalid opt_order stays in the context.

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

diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c
index 3a4b6ec56a..f441bd01ca 100644
--- a/libavcodec/alsdec.c
+++ b/libavcodec/alsdec.c
@@ -664,6 +664,7 @@ static int read_var_block_data(ALSDecContext *ctx, ALSBlockData *bd)
                                                 2, sconf->max_order + 1));
             *bd->opt_order       = get_bits(gb, opt_order_length);
             if (*bd->opt_order > sconf->max_order) {
+                *bd->opt_order = sconf->max_order;
                 av_log(avctx, AV_LOG_ERROR, "Predictor order too large!\n");
                 return -1;
             }