summaryrefslogtreecommitdiff
path: root/libavcodec/rangecoder.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-05-08 02:58:54 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-05-08 03:25:17 +0200
commit5f928c5201c077b9765610bc5304235c3f1d9bd6 (patch)
treef8ad2efb4faa42464c371a3df09eac21ff535c35 /libavcodec/rangecoder.c
parent3a4d387195a5eb3c1700071af8d8150e4f7f6600 (diff)
avcodec/rangecoder: Test for invalid corner case
Fixes runtime error: left shift of 1912602815 by 8 places cannot be represented in type 'int' Fixes: 1403/clusterfuzz-testcase-minimized-4724820484816896 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/rangecoder.c')
-rw-r--r--libavcodec/rangecoder.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/rangecoder.c b/libavcodec/rangecoder.c
index 9c6ef75b69..d7a2774d27 100644
--- a/libavcodec/rangecoder.c
+++ b/libavcodec/rangecoder.c
@@ -58,6 +58,10 @@ av_cold void ff_init_range_decoder(RangeCoder *c, const uint8_t *buf,
c->low = AV_RB16(c->bytestream);
c->bytestream += 2;
+ if (c->low >= 0xFF00) {
+ c->low = 0xFF00;
+ c->bytestream_end = c->bytestream + 2;
+ }
}
void ff_build_rac_states(RangeCoder *c, int factor, int max_p)