aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2018-02-14 00:32:30 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2018-02-15 04:36:00 +0100
commitf26a63c4ee1bdbe21d7ab462cd66f8ba20b14244 (patch)
tree90bd1a7de4f0276c9d3ecd4bbc097aacf793fd54
parentfb580731c1febec44e0f1ec1433f6b3ee89cfe65 (diff)
downloadffmpeg-f26a63c4ee1bdbe21d7ab462cd66f8ba20b14244.tar.gz
avcodec/h264_cabac: Tighten allowed coeff_abs range
Fixes: integer overflows Reported-by: "Xiaohan Wang (王消寒)" <xhwang@chromium.org> Based on limits in "8.5 Transform coefficient decoding process and picture construction process prior to deblocking filter process" Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/h264_cabac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c
index ec5fc74b9b..815149a501 100644
--- a/libavcodec/h264_cabac.c
+++ b/libavcodec/h264_cabac.c
@@ -1735,7 +1735,7 @@ decode_cabac_residual_internal(const H264Context *h, H264SliceContext *sl,
\
if( coeff_abs >= 15 ) { \
int j = 0; \
- while (get_cabac_bypass(CC) && j < 30) { \
+ while (get_cabac_bypass(CC) && j < 16+7) { \
j++; \
} \
\