From patchwork Sat May 27 10:21:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 3746 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp672097vsk; Sat, 27 May 2017 03:21:48 -0700 (PDT) X-Received: by 10.223.153.114 with SMTP id x105mr809225wrb.192.1495880508296; Sat, 27 May 2017 03:21:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495880508; cv=none; d=google.com; s=arc-20160816; b=jG/iHRwMigSf2EupQZWKHRKzmxilMzQ2FsZ8NQaF5dsgXuFz7OjfahztuMqY2IX5Jt ft0D7nGNfTdT+r5jb1VmmARckSWWPcskGUPHWbbNoVBmrc1z67b1u4zwlO599oIUZ+BL EQQGSJzS1t1HargfLumIBOO6wOJ7197UIA3KlYtlYjqRrMBo6MnSn9e4kXx5dPqMrFSK PobbbjBKoK9c1oHORO2CFJbC80Fj2r9wjybCruI1D4sYHpTOAyK4/Z8RI8L9Cyk+VcOD 7FVYo54B0jLYaQHfYPQ/xhh3OAd6oHYYB5G4FlzNu9xzdgN3ouiYMwLrLHP9rSt4OjCb zvYw== 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=G5fs4s40Nhj2hn/KSjOc4bnJP0NAfVWhagksdaEoL94=; b=FIF7UAlT+DNld2/ChwfnMDGXQNufWMvid54c4Mwhfv4SZ6F7WMN4fPAIBh2KpsUb4B vB46qAqarqYgcZs5DA4Rzn76Tj37AATt9u3wVpJVAMWVwaT/Gv6LT360X8L5NjsLdZme Ps0h7yLlTBvkVlCgkOWfjUHcH+L5+u74w5f8zkDTauSLPcLklC2dGMNqS4gvT/iCGzOw TnviOIN4IQlQmWHmgp1B3GmCRm0FXGThkENkN/HJIHUSEG8yfn+Ues280eIcu+4HieaU O1sBToZn539tu37hXL1uT49m3rLmKK6+fTKC4/cH+a4jAIKJhdREdB1wRRg874/WHATq srrg== 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 v12si16417173wmf.100.2017.05.27.03.21.47; Sat, 27 May 2017 03:21:48 -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 ED3B7689812; Sat, 27 May 2017 13:21:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe01-1.mx.upcmail.net (vie01a-qmta-pe01-1.mx.upcmail.net [62.179.121.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9BE9A6882AE for ; Sat, 27 May 2017 13:21:34 +0300 (EEST) Received: from [172.31.218.49] (helo=vie01a-dmta-pe05-1.mx.upcmail.net) by vie01a-pqmta-pe01.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1dEYqn-0007Dt-D3 for ffmpeg-devel@ffmpeg.org; Sat, 27 May 2017 12:21:37 +0200 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe07.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1dEYqh-0000c1-I1 for ffmpeg-devel@ffmpeg.org; Sat, 27 May 2017 12:21:31 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id RNMR1v00L0S5wYM01NMSYv; Sat, 27 May 2017 12:21:26 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 27 May 2017 12:21:25 +0200 Message-Id: <20170527102125.23498-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.13.0 Subject: [FFmpeg-devel] [PATCH] avcodec/fft_template: Fix multiple runtime error: signed integer overflow: -1943918714 - 1935113003 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: 1735/clusterfuzz-testcase-minimized-5350472347025408 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/fft_template.c | 50 +++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/libavcodec/fft_template.c b/libavcodec/fft_template.c index 480557f49f..6477372274 100644 --- a/libavcodec/fft_template.c +++ b/libavcodec/fft_template.c @@ -249,7 +249,7 @@ static void fft_calc_c(FFTContext *s, FFTComplex *z) { int nbits, i, n, num_transforms, offset, step; int n4, n2, n34; - FFTSample tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7, tmp8; + unsigned tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7, tmp8; FFTComplex *tmpz; const int fft_size = (1 << s->nbits); int64_t accu; @@ -260,14 +260,14 @@ static void fft_calc_c(FFTContext *s, FFTComplex *z) { offset = ff_fft_offsets_lut[n] << 2; tmpz = z + offset; - tmp1 = tmpz[0].re + tmpz[1].re; - tmp5 = tmpz[2].re + tmpz[3].re; - tmp2 = tmpz[0].im + tmpz[1].im; - tmp6 = tmpz[2].im + tmpz[3].im; - tmp3 = tmpz[0].re - tmpz[1].re; - tmp8 = tmpz[2].im - tmpz[3].im; - tmp4 = tmpz[0].im - tmpz[1].im; - tmp7 = tmpz[2].re - tmpz[3].re; + tmp1 = tmpz[0].re + (unsigned)tmpz[1].re; + tmp5 = tmpz[2].re + (unsigned)tmpz[3].re; + tmp2 = tmpz[0].im + (unsigned)tmpz[1].im; + tmp6 = tmpz[2].im + (unsigned)tmpz[3].im; + tmp3 = tmpz[0].re - (unsigned)tmpz[1].re; + tmp8 = tmpz[2].im - (unsigned)tmpz[3].im; + tmp4 = tmpz[0].im - (unsigned)tmpz[1].im; + tmp7 = tmpz[2].re - (unsigned)tmpz[3].re; tmpz[0].re = tmp1 + tmp5; tmpz[2].re = tmp1 - tmp5; @@ -288,19 +288,19 @@ static void fft_calc_c(FFTContext *s, FFTComplex *z) { offset = ff_fft_offsets_lut[n] << 3; tmpz = z + offset; - tmp1 = tmpz[4].re + tmpz[5].re; - tmp3 = tmpz[6].re + tmpz[7].re; - tmp2 = tmpz[4].im + tmpz[5].im; - tmp4 = tmpz[6].im + tmpz[7].im; + tmp1 = tmpz[4].re + (unsigned)tmpz[5].re; + tmp3 = tmpz[6].re + (unsigned)tmpz[7].re; + tmp2 = tmpz[4].im + (unsigned)tmpz[5].im; + tmp4 = tmpz[6].im + (unsigned)tmpz[7].im; tmp5 = tmp1 + tmp3; tmp7 = tmp1 - tmp3; tmp6 = tmp2 + tmp4; tmp8 = tmp2 - tmp4; - tmp1 = tmpz[4].re - tmpz[5].re; - tmp2 = tmpz[4].im - tmpz[5].im; - tmp3 = tmpz[6].re - tmpz[7].re; - tmp4 = tmpz[6].im - tmpz[7].im; + tmp1 = tmpz[4].re - (unsigned)tmpz[5].re; + tmp2 = tmpz[4].im - (unsigned)tmpz[5].im; + tmp3 = tmpz[6].re - (unsigned)tmpz[7].re; + tmp4 = tmpz[6].im - (unsigned)tmpz[7].im; tmpz[4].re = tmpz[0].re - tmp5; tmpz[0].re = tmpz[0].re + tmp5; @@ -311,13 +311,13 @@ static void fft_calc_c(FFTContext *s, FFTComplex *z) { tmpz[6].im = tmpz[2].im + tmp7; tmpz[2].im = tmpz[2].im - tmp7; - accu = (int64_t)Q31(M_SQRT1_2)*(tmp1 + tmp2); + accu = (int64_t)Q31(M_SQRT1_2)*(int)(tmp1 + tmp2); tmp5 = (int32_t)((accu + 0x40000000) >> 31); - accu = (int64_t)Q31(M_SQRT1_2)*(tmp3 - tmp4); + accu = (int64_t)Q31(M_SQRT1_2)*(int)(tmp3 - tmp4); tmp7 = (int32_t)((accu + 0x40000000) >> 31); - accu = (int64_t)Q31(M_SQRT1_2)*(tmp2 - tmp1); + accu = (int64_t)Q31(M_SQRT1_2)*(int)(tmp2 - tmp1); tmp6 = (int32_t)((accu + 0x40000000) >> 31); - accu = (int64_t)Q31(M_SQRT1_2)*(tmp3 + tmp4); + accu = (int64_t)Q31(M_SQRT1_2)*(int)(tmp3 + tmp4); tmp8 = (int32_t)((accu + 0x40000000) >> 31); tmp1 = tmp5 + tmp7; tmp3 = tmp5 - tmp7; @@ -348,10 +348,10 @@ static void fft_calc_c(FFTContext *s, FFTComplex *z) { offset = ff_fft_offsets_lut[n] << nbits; tmpz = z + offset; - tmp5 = tmpz[ n2].re + tmpz[n34].re; - tmp1 = tmpz[ n2].re - tmpz[n34].re; - tmp6 = tmpz[ n2].im + tmpz[n34].im; - tmp2 = tmpz[ n2].im - tmpz[n34].im; + tmp5 = tmpz[ n2].re + (unsigned)tmpz[n34].re; + tmp1 = tmpz[ n2].re - (unsigned)tmpz[n34].re; + tmp6 = tmpz[ n2].im + (unsigned)tmpz[n34].im; + tmp2 = tmpz[ n2].im - (unsigned)tmpz[n34].im; tmpz[ n2].re = tmpz[ 0].re - tmp5; tmpz[ 0].re = tmpz[ 0].re + tmp5;