diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-28 10:56:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-28 11:02:37 +0200 |
| commit | 107e9e44329aeec082740a50f7a0e906d9544292 (patch) | |
| tree | 7d91606d2bde74ed7c4db2b79b56fb3e7708a3f0 | |
| parent | a803ca54e5b8dceb19090ef6d182bbf6b2a3dbdd (diff) | |
| download | ffmpeg-107e9e44329aeec082740a50f7a0e906d9544292.tar.gz | |
wavpack: Properly check channel index, dont write out of arrays
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/wavpack.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index cf1bccf464..a6ce0f42a3 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -788,11 +788,6 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no, 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->ch, 0, sizeof(s->ch)); 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->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]; if (s->stereo) samples_r = data[wc->ch_offset + 1]; |