aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Aimar <fenrir@videolan.org>2011-09-25 13:43:38 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-09-25 23:01:44 +0200
commit508e47a5751b063e5b3d1d6aceda8a19ad8b1d37 (patch)
tree3828133c1db61357f9be347f2bdc7a36b6bbf388
parent7ec5ea437fc88ca58d7ac3cd12dfa2f0fbd4011f (diff)
downloadffmpeg-508e47a5751b063e5b3d1d6aceda8a19ad8b1d37.tar.gz
Check for out of bound bands limit in mpc v8 decoder.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/mpc8.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/mpc8.c b/libavcodec/mpc8.c
index cae7244ed5..436d7baa84 100644
--- a/libavcodec/mpc8.c
+++ b/libavcodec/mpc8.c
@@ -127,6 +127,8 @@ static av_cold int mpc8_decode_init(AVCodecContext * avctx)
skip_bits(&gb, 3);//sample rate
c->maxbands = get_bits(&gb, 5) + 1;
+ if (c->maxbands >= BANDS)
+ return AVERROR_INVALIDDATA;
channels = get_bits(&gb, 4) + 1;
if (channels > 2) {
av_log_missing_feature(avctx, "Multichannel MPC SV8", 1);
@@ -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);
if(maxband > 32) maxband -= 33;
}
+ if(maxband > c->maxbands)
+ return AVERROR_INVALIDDATA;
c->last_max_band = maxband;
/* read subband indexes */