[FFmpeg-cvslog] alsdec: limit avctx->bits_per_raw_sample to 32

[Andreas Cadhalpun]

ffmpeg | branch: release/2.6 | Andreas Cadhalpun <andreas.cadhalpun at googlemail.com> | Sat Apr 18 20:29:13 2015 +0200| [a298e13c2caa5a48aed69e0bf8d0e495ef8d9047] | committer: Andreas Cadhalpun

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.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 4c2b88678b436f59132386d9be2fc143e3ee480d)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a298e13c2caa5a48aed69e0bf8d0e495ef8d9047
---

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

diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c
index 8e0a076..bd20568 100644
--- a/libavcodec/alsdec.c
+++ b/libavcodec/alsdec.c
@@ -1670,6 +1670,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