alsdec: limit avctx->bits_per_raw_sample to 32

Message ID 20150505143215.7C2FC5DE60@aruru.libav.org
State New
Headers show

Commit Message

Janne Grunau May 5, 2015, 2:32 p.m.
Module: libav
Branch: master
Commit: e191aaca44b986816695e3b7ecfae64697fd6631

Author:    Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Committer: Anton Khirnov <anton@khirnov.net>
Date:      Sat Apr 18 20:29:13 2015 +0200

alsdec: limit avctx->bits_per_raw_sample to 32

avctx->bits_per_raw_sample is used in get_sbits_long, which only
supports up to 32 bits.

CC: libav-stable@libav.org
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

---

 libavcodec/alsdec.c |    6 ++++++
 1 file changed, 6 insertions(+)

Patch

diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c
index 814a054..093d083 100644
--- a/libavcodec/alsdec.c
+++ b/libavcodec/alsdec.c
@@ -1641,6 +1641,12 @@  static av_cold int decode_init(AVCodecContext *avctx)
         avctx->sample_fmt          = sconf->resolution > 1
                                      ? AV_SAMPLE_FMT_S32 : AV_SAMPLE_FMT_S16;
         avctx->bits_per_raw_sample = (sconf->resolution + 1) * 8;
+        if (avctx->bits_per_raw_sample > 32) {
+            av_log(avctx, AV_LOG_ERROR, "Bits per raw sample %d larger than 32.\n",
+                   avctx->bits_per_raw_sample);
+            ret = AVERROR_INVALIDDATA;
+            goto fail;
+        }
     }
 
     // set maximum Rice parameter for progressive decoding based on resolution