From 0a36341e967d69136c5a904b58c809f9d38c84c8 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 5 Jul 2017 00:05:11 +0200 Subject: [PATCH] avcodec/h264_slice: Fix signed integer overflow Fixes: runtime error: signed integer overflow: 26 + 2147483644 cannot be represented in type 'int' Fixes: 2456/clusterfuzz-testcase-minimized-4822695051001856 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer (cherry picked from commit 7592d97f10134422d4509ab1287796af70e003ba) Signed-off-by: Michael Niedermayer --- libavcodec/h264_slice.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 506e6775dc..86b72dff7f 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1805,7 +1805,7 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl, } sl->last_qscale_diff = 0; - tmp = pps->init_qp + get_se_golomb(&sl->gb); + tmp = pps->init_qp + (unsigned)get_se_golomb(&sl->gb); if (tmp > 51 + 6 * (sps->bit_depth_luma - 8)) { av_log(h->avctx, AV_LOG_ERROR, "QP %u out of range\n", tmp); return AVERROR_INVALIDDATA;