wmaenc: limit allowed sample rate to 48kHz

Message ID 20120303232520.CACC75DAF9@aruru.libav.org
State New
Headers show

Commit Message

Janne Grunau March 3, 2012, 11:25 p.m.
Module: libav
Branch: master
Commit: 1ec075cfecac01f9a289965db06f76365b0b1737

Author:    Justin Ruggles <justin.ruggles@gmail.com>
Committer: Justin Ruggles <justin.ruggles@gmail.com>
Date:      Fri Mar  2 16:27:57 2012 -0500

wmaenc: limit allowed sample rate to 48kHz

ff_wma_init() allows up to 50kHz, but this generates an exponent band
size table that requires 65 bands. The code assumes 25 bands in many
places, and using sample rates higher than 48kHz will lead to buffer
overwrites.

CC:libav-stable@libav.org

---

 libavcodec/wmaenc.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

Patch

diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c
index e24a3f4..99544c0 100644
--- a/libavcodec/wmaenc.c
+++ b/libavcodec/wmaenc.c
@@ -39,6 +39,12 @@  static int encode_init(AVCodecContext * avctx){
         return AVERROR(EINVAL);
     }
 
+    if (avctx->sample_rate > 48000) {
+        av_log(avctx, AV_LOG_ERROR, "sample rate is too high: %d > 48kHz",
+               avctx->sample_rate);
+        return AVERROR(EINVAL);
+    }
+
     if(avctx->bit_rate < 24*1000) {
         av_log(avctx, AV_LOG_ERROR, "bitrate too low: got %i, need 24000 or higher\n",
                avctx->bit_rate);