From cbd622be997e8307a409efc3b4bbe8765147def2 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 21 Feb 2017 03:51:17 +0100 Subject: avcodec/h264_ps: Check delta scale for validity Fixes: signed integer overflow: 5 + 2147483646 cannot be represented in type 'int' Fixes: 634/clusterfuzz-testcase-5285420445204480 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/h264_ps.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'libavcodec/h264_ps.c') diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index 270d06b52a..8090178395 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -257,8 +257,14 @@ static void decode_scaling_list(GetBitContext *gb, uint8_t *factors, int size, memcpy(factors, fallback_list, size * sizeof(uint8_t)); else for (i = 0; i < size; i++) { - if (next) - next = (last + get_se_golomb(gb)) & 0xff; + if (next) { + int v = get_se_golomb(gb); + if (v < -128 || v > 127) { + av_log(NULL, AV_LOG_ERROR, "delta scale %d is invalid\n", v); + v = -last; + } + next = (last + v) & 0xff; + } if (!i && !next) { /* matrix not written, we use the preset one */ memcpy(factors, jvt_list, size * sizeof(uint8_t)); break; -- cgit v1.2.3