diff options
| author | James Almer <jamrial@gmail.com> | 2017-04-06 23:45:20 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-04-06 23:45:20 -0300 |
| commit | 4fbb56acbe711ab4c01c0207cc9dabc27f7c6477 (patch) | |
| tree | cd4443cf0548cb57f39ba30352efab5a7c89d787 /libavcodec/tta.c | |
| parent | 208cceb24c9af3e1986785a466c01a94b3503e66 (diff) | |
| parent | 4adbb44ad154cec05e87de60bb827a13c0fe87df (diff) | |
| download | ffmpeg-4fbb56acbe711ab4c01c0207cc9dabc27f7c6477.tar.gz | |
Merge commit '4adbb44ad154cec05e87de60bb827a13c0fe87df'
* commit '4adbb44ad154cec05e87de60bb827a13c0fe87df':
tta: avoid undefined shifts
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/tta.c')
| -rw-r--r-- | libavcodec/tta.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/tta.c b/libavcodec/tta.c index c0162c5849..118b9f79ec 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; } |