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

[Andreas Cadhalpun]

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

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 at libav.org
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Signed-off-by: Anton Khirnov <anton at khirnov.net>
(cherry picked from commit e191aaca44b986816695e3b7ecfae64697fd6631)
Signed-off-by: Anton Khirnov <anton at khirnov.net>

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

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

diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c
index b1965a8..0a47305 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