aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-07-24 15:48:37 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-07-26 17:06:29 +0200
commit74c1c22d7f0d25f527ed2ebf62493be5ad52c972 (patch)
tree4a89735f2b0ac6c1b0f75b0e903eda5e04f16d4b /libavcodec
parentc220fe008c5a3f7c652dbd03ce2a58e392e59e19 (diff)
downloadffmpeg-74c1c22d7f0d25f527ed2ebf62493be5ad52c972.tar.gz
avcodec/hevc_ps: fix integer overflow in log2_parallel_merge_level_minus2
Fixes: runtime error: signed integer overflow: -2147483647 - 2 cannot be represented in type 'int' Fixes: 2702/clusterfuzz-testcase-minimized-4511932591636480 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/hevc_ps.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c
index 7358b318b0..21dbaf85a5 100644
--- a/libavcodec/hevc_ps.c
+++ b/libavcodec/hevc_ps.c
@@ -1432,6 +1432,7 @@ int ff_hevc_decode_nal_pps(GetBitContext *gb, AVCodecContext *avctx,
int i, ret = 0;
unsigned int pps_id = 0;
ptrdiff_t nal_size;
+ unsigned log2_parallel_merge_level_minus2;
AVBufferRef *pps_buf;
HEVCPPS *pps = av_mallocz(sizeof(*pps));
@@ -1629,13 +1630,14 @@ int ff_hevc_decode_nal_pps(GetBitContext *gb, AVCodecContext *avctx,
goto err;
}
pps->lists_modification_present_flag = get_bits1(gb);
- pps->log2_parallel_merge_level = get_ue_golomb_long(gb) + 2;
- if (pps->log2_parallel_merge_level > sps->log2_ctb_size) {
+ log2_parallel_merge_level_minus2 = get_ue_golomb_long(gb);
+ if (log2_parallel_merge_level_minus2 > sps->log2_ctb_size) {
av_log(avctx, AV_LOG_ERROR, "log2_parallel_merge_level_minus2 out of range: %d\n",
- pps->log2_parallel_merge_level - 2);
+ log2_parallel_merge_level_minus2);
ret = AVERROR_INVALIDDATA;
goto err;
}
+ pps->log2_parallel_merge_level = log2_parallel_merge_level_minus2 + 2;
pps->slice_header_extension_present_flag = get_bits1(gb);