1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00

Merge commit '4adbb44ad154cec05e87de60bb827a13c0fe87df'

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

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-04-06 23:45:20 -03:00
commit 4fbb56acbe

View File

@ -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;
}