diff options
author | Michael Niedermayer <[email protected]> | 2018-01-15 23:46:44 +0100 |
---|---|---|
committer | Michael Niedermayer <[email protected]> | 2018-01-28 15:33:09 +0100 |
commit | 11498c22a0db9ed08027405e5d6a4ba7c1e41418 (patch) | |
tree | e1819826b02cfaf48af33f16576888fa89dd09ee | |
parent | 2fdb27b5123d9a74d819ea8b019be878df5942ba (diff) |
avcodec/hevc_cabac: Check prefix so as to avoid invalid shifts in coeff_abs_level_remaining_decode()
I suspect that this can be limited tighter, but i failed to find anything
in the spec that would confirm that.
Fixes: 4833/clusterfuzz-testcase-minimized-5302840101699584
Fixes: runtime error: left shift of 134217730 by 4 places cannot be represented in type 'int'
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <[email protected]>
(cherry picked from commit a026a3efaeb9c2026668dccbbda339a21ab3206b)
Signed-off-by: Michael Niedermayer <[email protected]>
-rw-r--r-- | libavcodec/hevc_cabac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/hevc_cabac.c b/libavcodec/hevc_cabac.c index 743168500c..faa36d5459 100644 --- a/libavcodec/hevc_cabac.c +++ b/libavcodec/hevc_cabac.c @@ -998,7 +998,7 @@ static av_always_inline int coeff_abs_level_remaining_decode(HEVCContext *s, int } else { int prefix_minus3 = prefix - 3; - if (prefix == CABAC_MAX_BIN) { + if (prefix == CABAC_MAX_BIN || prefix_minus3 + rc_rice_param >= 31) { av_log(s->avctx, AV_LOG_ERROR, "CABAC_MAX_BIN : %d\n", prefix); return 0; } |