[FFmpeg-cvslog] Check for out of bound bands limit in mpc v8 decoder.
Laurent Aimar
git at videolan.org
Sat Oct 1 21:38:50 CEST 2011
ffmpeg | branch: release/0.8 | Laurent Aimar <fenrir at videolan.org> | Sun Sep 25 13:43:38 2011 +0200| [cdb72c827c4fc3d8a2dfe939654fa885aaedbbd1] | committer: Michael Niedermayer
Check for out of bound bands limit in mpc v8 decoder.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 508e47a5751b063e5b3d1d6aceda8a19ad8b1d37)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cdb72c827c4fc3d8a2dfe939654fa885aaedbbd1
---
libavcodec/mpc8.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/libavcodec/mpc8.c b/libavcodec/mpc8.c
index 2864b1a..bca5745 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 */
More information about the ffmpeg-cvslog
mailing list