avcodec/alsdec: check predictor order against block length
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Feb 2014 12:12:39 +0000 (13:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Feb 2014 12:13:34 +0000 (13:13 +0100)
Fixes out of array access
Fixes: abd3c041acbcb816be113455d138166b-asan_heap-oob_b11634_3707_cov_1707137151_als_05_2ch48k16b.mp4
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/alsdec.c

index c42b2ae..27d1902 100644 (file)
@@ -688,7 +688,11 @@ static int read_var_block_data(ALSDecContext *ctx, ALSBlockData *bd)
         } else {
             *bd->opt_order = sconf->max_order;
         }
-
+        if (*bd->opt_order > bd->block_length) {
+            *bd->opt_order = bd->block_length;
+            av_log(avctx, AV_LOG_ERROR, "Predictor order too large.\n");
+            return AVERROR_INVALIDDATA;
+        }
         opt_order = *bd->opt_order;
 
         if (opt_order) {