From patchwork Thu Nov 14 16:34:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 16266 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id AEF82449C82 for ; Thu, 14 Nov 2019 18:42:57 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9726D68A5E5; Thu, 14 Nov 2019 18:42:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-3.mx.upcmail.net (vie01a-dmta-pe02-3.mx.upcmail.net [62.179.121.159]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 428D268A8E2 for ; Thu, 14 Nov 2019 18:42:51 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1iVI6q-0003gK-0q for ffmpeg-devel@ffmpeg.org; Thu, 14 Nov 2019 17:36:40 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id VI5riiOUXwlysVI5ri9f3d; Thu, 14 Nov 2019 17:35:40 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=E5OzWpVl c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=kf9dt8z7VA8yIk4VL8EA:9 a=pHSJeCpb83v7lMVb:21 a=VvNOqb8pFtdAHMsB:21 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=UDnyf2zBuKT2w-IlGP_r:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 14 Nov 2019 17:34:08 +0100 Message-Id: <20191114163408.16682-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191114163408.16682-1-michael@niedermayer.cc> References: <20191114163408.16682-1-michael@niedermayer.cc> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfGuMrUxm8ed3WcULzguuwfxZstpYE19x7bLQDzCWsdegRzW0mdktmTiDm15lnJE2vfN+YKRHuI/0QcpBUxpoigGVq3GuAzLBxnvfLPMFnCxI3x2zp9ZA XgvFS/hqwpWRaAVjxkX8q7KRXshY3VKJsDqLlFC5my5d/8DDbxQUpLKV Subject: [FFmpeg-devel] [PATCH 5/5] avcodec/truespeech: Fix an integer overflow in truespeech_synth() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes: signed integer overflow: 2147483188 + 2048 cannot be represented in type 'int' Fixes: 18741/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TRUESPEECH_fuzzer-5748950460268544 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/truespeech.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/truespeech.c b/libavcodec/truespeech.c index d7c2d535e2..3cdae8c556 100644 --- a/libavcodec/truespeech.c +++ b/libavcodec/truespeech.c @@ -255,7 +255,7 @@ static void truespeech_synth(TSContext *dec, int16_t *out, int quart) int sum = 0; for(k = 0; k < 8; k++) sum += ptr0[k] * (unsigned)ptr1[k]; - sum = out[i] + ((sum + 0x800) >> 12); + sum = out[i] + ((int)(sum + 0x800U) >> 12); out[i] = av_clip(sum, -0x7FFE, 0x7FFE); for(k = 7; k > 0; k--) ptr0[k] = ptr0[k - 1];