From bf3f91c425b430b31e373e9eb5ffdaf1422132af Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 25 Apr 2023 22:50:55 +0200 Subject: [PATCH] avcodec/hevc_ps: Avoid signed overflow before check on QP Fixes: signed integer overflow: -2147483648 - 5 cannot be represented in type 'int' Fixes: 58066/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HEVC_fuzzer-5312995835379712 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/hevc_ps.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index 266adb6e86..5b84e53ced 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -1529,9 +1529,9 @@ static int pps_scc_extension(GetBitContext *gb, AVCodecContext *avctx, pps->pps_curr_pic_ref_enabled_flag = get_bits1(gb); if (pps->residual_adaptive_colour_transform_enabled_flag = get_bits1(gb)) { pps->pps_slice_act_qp_offsets_present_flag = get_bits1(gb); - pps->pps_act_y_qp_offset = get_se_golomb_long(gb) - 5; - pps->pps_act_cb_qp_offset = get_se_golomb_long(gb) - 5; - pps->pps_act_cr_qp_offset = get_se_golomb_long(gb) - 3; + pps->pps_act_y_qp_offset = get_se_golomb(gb) - 5; + pps->pps_act_cb_qp_offset = get_se_golomb(gb) - 5; + pps->pps_act_cr_qp_offset = get_se_golomb(gb) - 3; #define CHECK_QP_OFFSET(name) (pps->pps_act_ ## name ## _qp_offset <= -12 || \ pps->pps_act_ ## name ## _qp_offset >= 12)