Commit f5dfc351 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'd1bec4be'

* commit 'd1bec4be':
  wavpack: return an error on 0-sized blocks
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 2ba0953e d1bec4be
......@@ -771,11 +771,6 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
int i, j, id, size, ssize, weights, t;
int bpp, chan, chmask, orig_bpp;
if (buf_size == 0) {
*got_frame_ptr = 0;
return 0;
}
if (block_no >= wc->fdec_num && wv_alloc_frame_context(wc) < 0) {
av_log(avctx, AV_LOG_ERROR, "Error creating frame decode context\n");
return AVERROR_INVALIDDATA;
......@@ -1222,7 +1217,7 @@ static int wavpack_decode_frame(AVCodecContext *avctx, void *data,
frame_size = AV_RL32(buf + 8) + 12;
}
}
if (frame_size < 0 || frame_size > buf_size) {
if (frame_size <= 0 || frame_size > buf_size) {
av_log(avctx, AV_LOG_ERROR,
"Block %d has invalid size (size %d vs. %d bytes left)\n",
s->block, frame_size, buf_size);
......
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