Browse Source

mpc7: check subband index

This fixes a overread

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n0.11
Michael Niedermayer 13 years ago
parent
commit
8e9a0a3568
1 changed files with 4 additions and 0 deletions
  1. +4
    -0
      libavcodec/mpc7.c

+ 4
- 0
libavcodec/mpc7.c View File

@@ -248,6 +248,10 @@ static int mpc7_decode_frame(AVCodecContext * avctx, void *data,
if(i) t = get_vlc2(&gb, hdr_vlc.table, MPC7_HDR_BITS, 1) - 5; if(i) t = get_vlc2(&gb, hdr_vlc.table, MPC7_HDR_BITS, 1) - 5;
if(t == 4) bands[i].res[ch] = get_bits(&gb, 4); if(t == 4) bands[i].res[ch] = get_bits(&gb, 4);
else bands[i].res[ch] = bands[i-1].res[ch] + t; else bands[i].res[ch] = bands[i-1].res[ch] + t;
if (bands[i].res[ch] < -1 || bands[i].res[ch] > 17) {
av_log(avctx, AV_LOG_ERROR, "subband index invalid\n");
return AVERROR_INVALIDDATA;
}
} }


if(bands[i].res[0] || bands[i].res[1]){ if(bands[i].res[0] || bands[i].res[1]){


Loading…
Cancel
Save