diff options
| author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2013-08-24 15:00:08 +0200 |
|---|---|---|
| committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2013-08-26 09:23:39 +0200 |
| commit | 9e7b62f0fb7462a902330fcc82cf596388f0187b (patch) | |
| tree | aae1f336a70d250e218f219b875f95c457404668 /libavcodec/twinvq.c | |
| parent | b89e8759e053792704741d08cbc41c9ac3c7ed63 (diff) | |
| download | ffmpeg-9e7b62f0fb7462a902330fcc82cf596388f0187b.tar.gz | |
twinvq: set block align for codecs and use it in size checks
This both allows factoring out size check for both MetaSound and TwinVQ-VQF
decoders and fixes the situation when there are several MetaSound frames
stuffed together (that happens in 8kHz @ 8kbps MetaSound in ASF for example).
Diffstat (limited to 'libavcodec/twinvq.c')
| -rw-r--r-- | libavcodec/twinvq.c | 8 |
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; } /** |