[FFmpeg-cvslog] Merge commit '4adbb44ad154cec05e87de60bb827a13c0fe87df'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Apr  6 23:45:20 2017 -0300| [4fbb56acbe711ab4c01c0207cc9dabc27f7c6477] | committer: James Almer

Merge commit '4adbb44ad154cec05e87de60bb827a13c0fe87df'

* commit '4adbb44ad154cec05e87de60bb827a13c0fe87df':
  tta: avoid undefined shifts

Merged-by: James Almer <jamrial at gmail.com>

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

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

diff --git a/libavcodec/tta.c b/libavcodec/tta.c
index c0162c5..118b9f7 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 > MIN_CACHE_BITS) {
+            if (k >= 32 || unary > INT32_MAX >> k) {
                 ret = AVERROR_INVALIDDATA;
                 goto error;
             }


======================================================================