[FFmpeg-cvslog] avcodec/tta: Don't try to read more than MIN_CACHE_BITS bits

James Almer git at videolan.org
Fri Apr 7 18:56:04 EEST 2017


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Fri Apr  7 12:48:31 2017 -0300| [7c1566fec39492815eda0dc1fdfd18f8bf7ca635] | committer: James Almer

avcodec/tta: Don't try to read more than MIN_CACHE_BITS bits

This fixes assertion failures introduced in 4fbb56acbe.

Reviewed-by: michaelni
Reviewed-by: durandal_1707

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

 libavcodec/tta.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/tta.c b/libavcodec/tta.c
index 118b9f7..8f097b3 100644
--- a/libavcodec/tta.c
+++ b/libavcodec/tta.c
@@ -285,7 +285,7 @@ static int tta_decode_frame(AVCodecContext *avctx, void *data,
         }
 
         if (k) {
-            if (k >= 32 || unary > INT32_MAX >> k) {
+            if (k > MIN_CACHE_BITS || unary > INT32_MAX >> k) {
                 ret = AVERROR_INVALIDDATA;
                 goto error;
             }



More information about the ffmpeg-cvslog mailing list