diff options
author | Laurent Aimar <[email protected]> | 2011-09-25 13:43:38 +0200 |
---|---|---|
committer | Michael Niedermayer <[email protected]> | 2011-10-01 20:30:43 +0200 |
commit | cdb72c827c4fc3d8a2dfe939654fa885aaedbbd1 (patch) | |
tree | 1c6935d2f1af346d9deb99dfde91c3d5e0456411 | |
parent | 521dbccc1137fdf3c7ebdd75afe64a4d2567ba22 (diff) |
Check for out of bound bands limit in mpc v8 decoder.
Signed-off-by: Michael Niedermayer <[email protected]>
(cherry picked from commit 508e47a5751b063e5b3d1d6aceda8a19ad8b1d37)
-rw-r--r-- | libavcodec/mpc8.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/mpc8.c b/libavcodec/mpc8.c index 2864b1a010..bca57451ca 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 */ |