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

Andreas Cadhalpun andreas.cadhalpun at googlemail.com
Sat Apr 18 20:29:13 CEST 2015


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>
---
 libavcodec/alsdec.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c
index e0453e9..8ecc47c 100644
--- a/libavcodec/alsdec.c
+++ b/libavcodec/alsdec.c
@@ -1678,6 +1678,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
-- 
2.1.4


More information about the ffmpeg-devel mailing list