Commit 508e47a5 authored by Laurent Aimar's avatar Laurent Aimar Committed by Michael Niedermayer

Check for out of bound bands limit in mpc v8 decoder.

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 7ec5ea43
...@@ -127,6 +127,8 @@ static av_cold int mpc8_decode_init(AVCodecContext * avctx) ...@@ -127,6 +127,8 @@ static av_cold int mpc8_decode_init(AVCodecContext * avctx)
skip_bits(&gb, 3);//sample rate skip_bits(&gb, 3);//sample rate
c->maxbands = get_bits(&gb, 5) + 1; c->maxbands = get_bits(&gb, 5) + 1;
if (c->maxbands >= BANDS)
return AVERROR_INVALIDDATA;
channels = get_bits(&gb, 4) + 1; channels = get_bits(&gb, 4) + 1;
if (channels > 2) { if (channels > 2) {
av_log_missing_feature(avctx, "Multichannel MPC SV8", 1); av_log_missing_feature(avctx, "Multichannel MPC SV8", 1);
...@@ -260,6 +262,8 @@ static int mpc8_decode_frame(AVCodecContext * avctx, ...@@ -260,6 +262,8 @@ static int mpc8_decode_frame(AVCodecContext * avctx,
maxband = c->last_max_band + get_vlc2(gb, band_vlc.table, MPC8_BANDS_BITS, 2); maxband = c->last_max_band + get_vlc2(gb, band_vlc.table, MPC8_BANDS_BITS, 2);
if(maxband > 32) maxband -= 33; if(maxband > 32) maxband -= 33;
} }
if(maxband > c->maxbands)
return AVERROR_INVALIDDATA;
c->last_max_band = maxband; c->last_max_band = maxband;
/* read subband indexes */ /* read subband indexes */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment