Commit b7d16dc4 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wavpack: check packet size early
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 402bec52 fd062912
...@@ -1216,6 +1216,9 @@ static int wavpack_decode_frame(AVCodecContext *avctx, void *data, ...@@ -1216,6 +1216,9 @@ static int wavpack_decode_frame(AVCodecContext *avctx, void *data,
int frame_size, ret, frame_flags; int frame_size, ret, frame_flags;
int samplecount = 0; int samplecount = 0;
if (avpkt->size < 12 + s->multichannel * 4)
return AVERROR_INVALIDDATA;
s->block = 0; s->block = 0;
s->ch_offset = 0; s->ch_offset = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment