Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wavpack: check packet size early

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-23 10:55:00 +02:00
commit b7d16dc4bd
1 changed files with 3 additions and 0 deletions

View File

@ -1216,6 +1216,9 @@ static int wavpack_decode_frame(AVCodecContext *avctx, void *data,
int frame_size, ret, frame_flags;
int samplecount = 0;
if (avpkt->size < 12 + s->multichannel * 4)
return AVERROR_INVALIDDATA;
s->block = 0;
s->ch_offset = 0;