diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-30 22:56:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-28 03:51:23 +0100 |
| commit | c2d3f06882abb0298a76a264b423d7c28155bb70 (patch) | |
| tree | 3d60958698280980917d324f4c8c6430dbe15c1c | |
| parent | 01c90eea6cc08bab89322175b4c50ae8a96fcc2b (diff) | |
| download | ffmpeg-c2d3f06882abb0298a76a264b423d7c28155bb70.tar.gz | |
wma: check byte_offset_bits
Fixes assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 984add64a41c3296a8a82051cc90bff2eb449609)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/wma.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/wma.c b/libavcodec/wma.c index ff01f49b5c..12faf273e5 100644 --- a/libavcodec/wma.c +++ b/libavcodec/wma.c @@ -133,6 +133,10 @@ int ff_wma_init(AVCodecContext * avctx, int flags2) bps = (float)s->bit_rate / (float)(s->nb_channels * s->sample_rate); s->byte_offset_bits = av_log2((int)(bps * s->frame_len / 8.0 + 0.5)) + 2; + if (s->byte_offset_bits + 3 > MIN_CACHE_BITS) { + av_log(avctx, AV_LOG_ERROR, "byte_offset_bits %d is too large\n", s->byte_offset_bits); + return AVERROR_PATCHWELCOME; + } /* compute high frequency value and choose if noise coding should be activated */ |