Merge commit '93fbf034c94caf7ddfecd3c1947e3139fef6bfca' into release/1.1

* commit '93fbf034c94caf7ddfecd3c1947e3139fef6bfca':
  wavpack: check packet size early

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-06-03 00:52:13 +02:00

View File

@@ -1185,6 +1185,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;