diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-14 11:07:11 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2012-10-14 16:03:24 -0400 |
| commit | 6744eee1e5bf68feb9930f1e3617311587b9d7a7 (patch) | |
| tree | 833692907dd8b61d4efee294ad91d119c1b5b67b | |
| parent | 14bba214fa9a143c61f95c62941c105d7c3b6ddd (diff) | |
| download | ffmpeg-6744eee1e5bf68feb9930f1e3617311587b9d7a7.tar.gz | |
wmaprodec: check num_vec_coeffs for validity
Fixes CVE-2012-2789
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 99f392a584dd10b553facc8e819f2c7e982e176d)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| -rw-r--r-- | libavcodec/wmaprodec.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index a1b82db60a..3b8c2c8676 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -1166,7 +1166,12 @@ static int decode_subframe(WMAProDecodeCtx *s) int num_bits = av_log2((s->subframe_len + 3)/4) + 1; for (i = 0; i < s->channels_for_cur_subframe; i++) { int c = s->channel_indexes_for_cur_subframe[i]; - s->channel[c].num_vec_coeffs = get_bits(&s->gb, num_bits) << 2; + int num_vec_coeffs = get_bits(&s->gb, num_bits) << 2; + if (num_vec_coeffs > WMAPRO_BLOCK_MAX_SIZE) { + av_log(s->avctx, AV_LOG_ERROR, "num_vec_coeffs %d is too large\n", num_vec_coeffs); + return AVERROR_INVALIDDATA; + } + s->channel[c].num_vec_coeffs = num_vec_coeffs; } } else { for (i = 0; i < s->channels_for_cur_subframe; i++) { |