har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

alsdec: check opt_order.

Browse Source 
Fixes out of array write in quant_cof

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-03-24 01:39:13 +01:00
parent 2c0559d5e2
commit 9d3032b960
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/alsdec.c
View File

@ -663,6 +663,10 @@ static int read_var_block_data(ALSDecContext *ctx, ALSBlockData *bd)
int opt_order_length = av_ceil_log2(av_clip((bd->block_length >> 3) - 1, int opt_order_length = av_ceil_log2(av_clip((bd->block_length >> 3) - 1,
2, sconf->max_order + 1)); 2, sconf->max_order + 1));
*bd->opt_order = get_bits(gb, opt_order_length); *bd->opt_order = get_bits(gb, opt_order_length);
if (*bd->opt_order > sconf->max_order) {
av_log(avctx, AV_LOG_ERROR, "Order too large\n");
return -1;
}
} else { } else {
*bd->opt_order = sconf->max_order; *bd->opt_order = sconf->max_order;
} }