git.videolan.org
/
ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit '4adbb44ad154cec05e87de60bb827a13c0fe87df'
[ffmpeg.git]
/
libavcodec
/
tta.c
diff --git
a/libavcodec/tta.c
b/libavcodec/tta.c
index
c0162c5
..
118b9f7
100644
(file)
--- 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;
}