From ce010655a6b82d49bd8df179d73bcb5802a273c1 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 8 Mar 2017 21:35:51 +0100 Subject: avcodec/dca_xll: Fix runtime error: signed integer overflow: 2147286116 + 6298923 cannot be represented in type 'int' Fixes: 732/clusterfuzz-testcase-4872990070145024 See: [FFmpeg-devel] [PATCH 2/6] avcodec/dca_xll: Fix runtime error: signed integer overflow: 2147286116 + 6298923 cannot be represented in type 'int' Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/dca_xll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavcodec/dca_xll.c') diff --git a/libavcodec/dca_xll.c b/libavcodec/dca_xll.c index b7331e04b9..38a1999fc8 100644 --- a/libavcodec/dca_xll.c +++ b/libavcodec/dca_xll.c @@ -1312,7 +1312,7 @@ static int combine_residual_frame(DCAXllDecoder *s, DCAXllChSet *c) } else { // No downmix scaling for (n = 0; n < nsamples; n++) - dst[n] += (src[n] + round) >> shift; + dst[n] += (unsigned)((src[n] + round) >> shift); } } -- cgit v1.2.1