generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wavpack: Properly check channel index, dont write out of arrays

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-28 10:56:25 +02:00
parent a803ca54e5
commit 107e9e4432
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/wavpack.c
View File

@ -788,11 +788,6 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (wc->ch_offset >= avctx->channels) {
av_log(avctx, AV_LOG_ERROR, "too many channels\n");
return -1;
}
memset(s->decorr, 0, MAX_TERMS * sizeof(Decorr)); memset(s->decorr, 0, MAX_TERMS * sizeof(Decorr));
memset(s->ch, 0, sizeof(s->ch)); memset(s->ch, 0, sizeof(s->ch));
s->extra_bits = 0; s->extra_bits = 0;
@ -829,6 +824,11 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
s->hybrid_minclip = ((-1LL << (orig_bpp - 1))); s->hybrid_minclip = ((-1LL << (orig_bpp - 1)));
s->CRC = bytestream2_get_le32(&gb); s->CRC = bytestream2_get_le32(&gb);
if (wc->ch_offset + s->stereo >= avctx->channels) {
av_log(avctx, AV_LOG_ERROR, "too many channels\n");
return -1;
}
samples_l = data[wc->ch_offset]; samples_l = data[wc->ch_offset];
if (s->stereo) if (s->stereo)
samples_r = data[wc->ch_offset + 1]; samples_r = data[wc->ch_offset + 1];