Commit c66e5887 authored by kostya's avatar kostya

Correctly handle data_size on decoding

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@8451 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 4bff3b5a
......@@ -383,14 +383,20 @@ static int wavpack_decode_frame(AVCodecContext *avctx,
uint8_t* buf_end = buf + buf_size;
int i, j, id, size, ssize, weights, t;
if (buf_size == 0) return 0;
if (buf_size == 0){
*data_size = 0;
return 0;
}
memset(s->decorr, 0, MAX_TERMS * sizeof(Decorr));
s->samples = AV_RL32(buf); buf += 4;
if(!s->samples) return buf_size;
if(!s->samples){
*data_size = 0;
return buf_size;
}
/* should not happen but who knows */
if(s->samples * 2 * avctx->channels > AVCODEC_MAX_AUDIO_FRAME_SIZE){
if(s->samples * 2 * avctx->channels > *data_size){
av_log(avctx, AV_LOG_ERROR, "Packet size is too big to be handled in lavc!\n");
return -1;
}
......
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