[FFmpeg-cvslog] tta: check output buffer size after adjusting frame length for last frame

Justin Ruggles git at videolan.org
Wed Oct 26 02:46:28 CEST 2011


ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Thu Sep 22 13:09:05 2011 -0400| [e6923f683c506cbb581eb7f31288801f1a065fb0] | committer: Justin Ruggles

tta: check output buffer size after adjusting frame length for last frame

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e6923f683c506cbb581eb7f31288801f1a065fb0
---

 libavcodec/tta.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/libavcodec/tta.c b/libavcodec/tta.c
index 74d0d46..b77034c 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;



More information about the ffmpeg-cvslog mailing list