aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2011-09-22 13:09:05 -0400
committerJustin Ruggles <justin.ruggles@gmail.com>2011-10-25 11:22:01 -0400
commite6923f683c506cbb581eb7f31288801f1a065fb0 (patch)
treedd7489dbc49dec1249afb85c74885bfeb55a6a9f /libavcodec
parentb16960a8a5373de74027751a72f3b4f3e9c7fb77 (diff)
downloadffmpeg-e6923f683c506cbb581eb7f31288801f1a065fb0.tar.gz
tta: check output buffer size after adjusting frame length for last frame
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/tta.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/tta.c b/libavcodec/tta.c
index 74d0d462d2..b77034cdf5 100644
--- a/libavcodec/tta.c
+++ b/libavcodec/tta.c
@@ -285,15 +285,16 @@ static int tta_decode_frame(AVCodecContext *avctx,
int cur_chan = 0, framelen = s->frame_length;
int32_t *p;
- if (*data_size < (framelen * s->channels * 2)) {
- av_log(avctx, AV_LOG_ERROR, "Output buffer size is too small.\n");
- return -1;
- }
// FIXME: seeking
s->total_frames--;
if (!s->total_frames && s->last_frame_length)
framelen = s->last_frame_length;
+ if (*data_size < (framelen * s->channels * 2)) {
+ av_log(avctx, AV_LOG_ERROR, "Output buffer size is too small.\n");
+ return -1;
+ }
+
// init per channel states
for (i = 0; i < s->channels; i++) {
s->ch_ctx[i].predictor = 0;