aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-05-10 00:56:45 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-05-16 16:00:23 +0200
commit9b14178421c7b1aa34f9ce526ca89a42ee392813 (patch)
treeb0a04ba08474fafb75063189c1f0b69f7f1589bf /libavcodec
parent1ddb2441d6bff489ee38495152d6ee988dfa96fc (diff)
downloadffmpeg-9b14178421c7b1aa34f9ce526ca89a42ee392813.tar.gz
avcodec/lagarith: Check scale_factor
Fixes: 1425/clusterfuzz-testcase-minimized-6295712339853312 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit ed3c9b5b0dd5abb545c48e930e1c32c187b0776a) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/lagarith.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/lagarith.c b/libavcodec/lagarith.c
index a3e8347004..2ad6c61c59 100644
--- a/libavcodec/lagarith.c
+++ b/libavcodec/lagarith.c
@@ -191,7 +191,9 @@ static int lag_read_prob_header(lag_rac *rac, GetBitContext *gb)
}
scale_factor++;
- cumulative_target = 1 << scale_factor;
+ if (scale_factor >= 32U)
+ return AVERROR_INVALIDDATA;
+ cumulative_target = 1U << scale_factor;
if (scaled_cumul_prob > cumulative_target) {
av_log(rac->avctx, AV_LOG_ERROR,