summaryrefslogtreecommitdiff
path: root/libavcodec/twinvq.c
diff options
context:
space:
mode:
Diffstat (limited to 'libavcodec/twinvq.c')
-rw-r--r--libavcodec/twinvq.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/libavcodec/twinvq.c b/libavcodec/twinvq.c
index 17dea79ed7..24f57478f8 100644
--- a/libavcodec/twinvq.c
+++ b/libavcodec/twinvq.c
@@ -491,6 +491,12 @@ int ff_twinvq_decode_frame(AVCodecContext *avctx, void *data,
out = (float **)frame->extended_data;
}
+ if (buf_size < avctx->block_align) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Frame too small (%d bytes). Truncated file?\n", buf_size);
+ return AVERROR(EINVAL);
+ }
+
if ((ret = tctx->read_bitstream(avctx, tctx, buf, buf_size)) < 0)
return ret;
@@ -508,7 +514,7 @@ int ff_twinvq_decode_frame(AVCodecContext *avctx, void *data,
*got_frame_ptr = 1;
- return buf_size;
+ return avctx->block_align;
}
/**