From 231745781f16bbee6af0e11459087d9272cb0853 Mon Sep 17 00:00:00 2001
From: Kostya Shishkov <kostya.shishkov@gmail.com>
Date: Sun, 11 Jul 2010 14:50:20 +0000
Subject: Do not try to decode less than one frame of data in TrueSpeech
 decoder. This should solve issue 2085.

Originally committed as revision 24197 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/truespeech.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'libavcodec/truespeech.c')

diff --git a/libavcodec/truespeech.c b/libavcodec/truespeech.c
index 37fbef9dea..eafbca52d8 100644
--- a/libavcodec/truespeech.c
+++ b/libavcodec/truespeech.c
@@ -347,6 +347,11 @@ static int truespeech_decode_frame(AVCodecContext *avctx,
     if (!buf_size)
         return 0;
 
+    if (buf_size < 32) {
+        av_log(avctx, AV_LOG_ERROR,
+               "Too small input buffer (%d bytes), need at least 32 bytes\n", buf_size);
+        return -1;
+    }
     iterations = FFMIN(buf_size / 32, *data_size / 480);
     for(j = 0; j < iterations; j++) {
         truespeech_read_frame(c, buf + consumed);
-- 
cgit v1.2.1