Browse Source

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wavpack: check packet size early

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.0
Michael Niedermayer 12 years ago
parent
commit
b7d16dc4bd
1 changed files with 3 additions and 0 deletions
  1. +3
    -0
      libavcodec/wavpack.c

+ 3
- 0
libavcodec/wavpack.c 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;



Loading…
Cancel
Save