diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-16 13:12:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-23 15:00:02 +0100 |
| commit | 6341a7006d74bf557c9ffb2a19f15e511d9b3b2b (patch) | |
| tree | 8dc72f1aab8c02081e11671438120c144f501e0c | |
| parent | 7034e808f6b2b102d2b3f5b837915201f813a37c (diff) | |
| download | android_external_ffmpeg-6341a7006d74bf557c9ffb2a19f15e511d9b3b2b.tar.gz android_external_ffmpeg-6341a7006d74bf557c9ffb2a19f15e511d9b3b2b.tar.bz2 android_external_ffmpeg-6341a7006d74bf557c9ffb2a19f15e511d9b3b2b.zip | |
avcodec/alsdec: check predictor order against block length
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>
(cherry picked from commit 18f94df8af04f2c02a25a7dec512289feff6517f)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/alsdec.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c index 7b99d8689e..e1e6738049 100644 --- a/libavcodec/alsdec.c +++ b/libavcodec/alsdec.c @@ -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) { |