[libav-commits] alsdec: Check k used for rice decoder.

Michael Niedermayer git at libav.org
Fri Jan 4 08:09:20 CET 2013


Module: libav
Branch: release/0.7
Commit: aa45b90804ab21175b8c116bd8e5eb4b4e85fbcb

Author:    Michael Niedermayer <michaelni at gmx.at>
Committer: Reinhard Tartler <siretart at tauware.de>
Date:      Sat Apr  7 17:25:47 2012 +0200

alsdec: Check k used for rice decoder.

Values that fail this check will cause failure of decode_rice()

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles at gmail.com>
(cherry picked from commit 23aae62c2cb4504a09ceb8cd0cabc1c8b260f521)

Signed-off-by: Reinhard Tartler <siretart at tauware.de>

---

 libavcodec/alsdec.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c
index cdf2a7c..cfe8fd3 100644
--- a/libavcodec/alsdec.c
+++ b/libavcodec/alsdec.c
@@ -650,6 +650,11 @@ static int read_var_block_data(ALSDecContext *ctx, ALSBlockData *bd)
         for (k = 1; k < sub_blocks; k++)
             s[k] = s[k - 1] + decode_rice(gb, 0);
     }
+    for (k = 1; k < sub_blocks; k++)
+        if (s[k] > 32) {
+            av_log(avctx, AV_LOG_ERROR, "k invalid for rice code.\n");
+            return AVERROR_INVALIDDATA;
+        }
 
     if (get_bits1(gb))
         *bd->shift_lsbs = get_bits(gb, 4) + 1;



More information about the libav-commits mailing list