diff options
| author | Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> | 2015-04-18 20:29:13 +0200 |
|---|---|---|
| committer | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2015-05-14 19:06:16 +0200 |
| commit | a298e13c2caa5a48aed69e0bf8d0e495ef8d9047 (patch) | |
| tree | 0977600fa1f365a5243ec3d6e6fac2d3d9cff149 | |
| parent | 50fb69c7375198485d3cabaf5cd7449e4116dee8 (diff) | |
| download | ffmpeg-a298e13c2caa5a48aed69e0bf8d0e495ef8d9047.tar.gz | |
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@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4c2b88678b436f59132386d9be2fc143e3ee480d)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
| -rw-r--r-- | libavcodec/alsdec.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c index 8e0a07636d..bd20568ac8 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 |