From patchwork Tue May 23 19:08:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 3719 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp2029984vsk; Tue, 23 May 2017 12:09:43 -0700 (PDT) X-Received: by 10.223.174.200 with SMTP id y66mr20563831wrc.79.1495566583554; Tue, 23 May 2017 12:09:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495566583; cv=none; d=google.com; s=arc-20160816; b=hx29NYN35kr9bbhUDiXf7BJ34P4kchhI8rbffpk51OWod7Z4Jb4XVE4kcAojaCqlI7 bg222DRWknRIdICBwFFjOFhy3pu1p8pCGIazmDQHIqE4Xi62ayThsPQ13ZfkhmE7MTLA NGoR84FY2BZZQiqZ9Rnnxfw/DABReVdKfvr9PoLeKHcvpjoaVf2MXSMncfHkXS06WMC3 kU/8LAsT2tp62hjqtHvKl6guFhqG+f+BvVPfMTkY7EoJn6APdYZSZ5JhrIlj4YILax2c vDaSjjn4DmJmqW+twKp2aB3JXwuVc4jU8qo5O/alDQoAwGQ1KU5JtBcvs3UIoxIU09LY oaoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to :arc-authentication-results; bh=J3HmAtoQhtUjSWmtueTXZ85aTk1Gx8PNNKB4H1xlRM0=; b=FEp6L1G9Rz8XjOB/CejeQEtoZ+KBPeQ2AEu2CiynEQ9TKIkFxp4ahdRRwnclI5o2Rn 0rDkO/5O3AzskuE6EQGBjDREvfGFrrlN1N47+wS4ACjim/HIFC6QF8jnlYVk3vo51EgA 7JVkUj+QzZp5WFujopWmc5QKbK7EFPU2HwyLXMk03J/Rt9F0oWxgBGWxUlLlpUkvxL/S Iqu4ITnNa7FCSxpneFJXdIg4BaaJWnRIOqxn3PNGVjMCfa25sRHWI8ilNIad/8rf9wVy JJu9veBl5VyL+7FLSlBMIhBA5VsjmBTGmTbPu/SkmeYstKMlGGrv9YUCqUGCn+S5uK7x DspA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q136si3333097wmb.154.2017.05.23.12.09.42; Tue, 23 May 2017 12:09:43 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 57486689B06; Tue, 23 May 2017 22:09:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe01-2.mx.upcmail.net (vie01a-qmta-pe01-2.mx.upcmail.net [62.179.121.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 71C85689AF0 for ; Tue, 23 May 2017 22:09:31 +0300 (EEST) Received: from [172.31.218.42] (helo=vie01a-dmta-pe04-3.mx.upcmail.net) by vie01a-pqmta-pe01.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1dDFBV-0008Nm-4u for ffmpeg-devel@ffmpeg.org; Tue, 23 May 2017 21:09:33 +0200 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1dDFBP-0007A1-1y for ffmpeg-devel@ffmpeg.org; Tue, 23 May 2017 21:09:27 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id Pv8p1v00Y0S5wYM01v8qxR; Tue, 23 May 2017 21:08:50 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 23 May 2017 21:08:48 +0200 Message-Id: <20170523190848.10022-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.13.0 Subject: [FFmpeg-devel] [PATCH] avcodec/sbrdsp_template: Fix: runtime error: signed integer overflow: 849815297 + 1315389781 cannot be represented in type 'int' 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes: 1770/clusterfuzz-testcase-minimized-5285511235108864 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/sbrdsp_template.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libavcodec/sbrdsp_template.c b/libavcodec/sbrdsp_template.c index b649dfd7ee..897a3bbffb 100644 --- a/libavcodec/sbrdsp_template.c +++ b/libavcodec/sbrdsp_template.c @@ -33,8 +33,13 @@ static void sbr_qmf_deint_bfly_c(INTFLOAT *v, const INTFLOAT *src0, const INTFLO { int i; for (i = 0; i < 64; i++) { - v[ i] = AAC_SRA_R((src0[i] - src1[63 - i]), 5); - v[127 - i] = AAC_SRA_R((src0[i] + src1[63 - i]), 5); +#if USE_FIXED + v[ i] = (int)(0x10U + src0[i] - src1[63 - i]) >> 5; + v[127 - i] = (int)(0x10U + src0[i] + src1[63 - i]) >> 5; +#else + v[ i] = src0[i] - src1[63 - i]; + v[127 - i] = src0[i] + src1[63 - i]; +#endif } }