aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2020-01-28 20:12:25 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2020-07-01 13:33:44 +0200
commit134d579dfcf108465425da75e89ee0f62aaf09be (patch)
tree683d671ae9481741f6349720073c507b3a075553
parent73c20eb18e99f3061e644d2426528ffa7be07075 (diff)
downloadffmpeg-134d579dfcf108465425da75e89ee0f62aaf09be.tar.gz
avcodec/lagarith: Sanity check scale
A value of 24 and above can collaps the range to 0 which would not work. Fixes: Timeout (75sec -> 21sec) Fixes: 18707/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LAGARITH_fuzzer-5708950892969984 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit fb3855342b9e4c577c63b38a7a5a574830a21934) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/lagarith.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/lagarith.c b/libavcodec/lagarith.c
index 0f4aa89486..ff3eded761 100644
--- a/libavcodec/lagarith.c
+++ b/libavcodec/lagarith.c
@@ -222,6 +222,9 @@ static int lag_read_prob_header(lag_rac *rac, GetBitContext *gb)
}
}
+ if (scale_factor > 23)
+ return AVERROR_INVALIDDATA;
+
rac->scale = scale_factor;
/* Fill probability array with cumulative probability for each symbol. */