From patchwork Fri Sep 1 17:56:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 4944 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp862103jao; Fri, 1 Sep 2017 10:56:31 -0700 (PDT) X-Google-Smtp-Source: ADKCNb4KIZr3729l1iv4pkP436e0jKxmWbP2o5WaQnl+NK7MRhd7W69mIqr5/ZcLcl8vmqoagbMJ X-Received: by 10.28.197.2 with SMTP id v2mr954113wmf.9.1504288591484; Fri, 01 Sep 2017 10:56:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504288591; cv=none; d=google.com; s=arc-20160816; b=MRuyGSY91WYk1Xqdc+QcQLCENGTA+7qqLLqpJz+0JqCzTK60hHR5GOcIREn3LbfKBH rFS1PdvSC2qBVmDqg5Xn7qEEvsKatLgGFsCIoxnXFisfIPGAl3JdEWAi7iHxhH+J4xW+ GIB7+tuxXbPvP1re6lEA6UimDooK/YDbkaE8aAY0AsrCnKeIsoik9ZIaCBAvByoxo7XF sIxw+anABDsoW8jFkzRf999oLKHAFkZDCAhB1OrmWjhFUS2Zrv+6JyoHLEF44lAIXpM2 s0eK1Y+4voUqLUEBTkqz9cMXyyDj6+WSIboyhuw19nf150cgWGOQArTRREkJdxsF1R/3 sjQw== 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:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=nWbc98hJWBEnE0ys7RZldKUlWiNTmbiub89+W+JLXII=; b=up6pFNLHV96YCWYN4dKjxSctLE7jw3WEMIwzVnkWXVNPPMn/0UU90l8PkfVIPTysEy ZhYd6oSelgEMRFgA3pAeXaicB2pcHXHn4FuvsFx4VgqZdphrzCsSpjTcat+7Vyyq3RV+ NDA1pFSY53gBBm/zLwvQ/PynQNvsQ+tZOdd334ShdgB4S8gMufT7v8PirbQAEJbQHtjU Vc1vJkhqMB7yyMiWZ1EnGjob6pFvdgIndyla23xvIcX4ttkqpH1paPvWXlGMDSsZkL4W qkBpluiI9p7fZiFuBI9uBoeqjVSl6voQOfci6miA1wuAjGWcugYWE/aFacNtqQ8EcWsa 79aQ== 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 k139si479424wmg.80.2017.09.01.10.56.31; Fri, 01 Sep 2017 10:56:31 -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 8D7A768A243; Fri, 1 Sep 2017 20:56:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-2.mx.upcmail.net (vie01a-dmta-pe03-2.mx.upcmail.net [62.179.121.161]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0E0CA68A1CC for ; Fri, 1 Sep 2017 20:56:17 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1dnqB0-0007QY-Ba for ffmpeg-devel@ffmpeg.org; Fri, 01 Sep 2017 19:56:18 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id 4HwE1w00a0S5wYM01HwFhW; Fri, 01 Sep 2017 19:56:15 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 1 Sep 2017 19:56:11 +0200 Message-Id: <20170901175612.18603-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170901175612.18603-1-michael@niedermayer.cc> References: <20170901175612.18603-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/dirac_dwt: Fix multiple overflows in 9/7 lifting 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: runtime error: signed integer overflow: 1073901567 + 1073901567 cannot be represented in type 'int' Fixes: 3124/clusterfuzz-testcase-minimized-454643435752652 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/dirac_dwt.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/dirac_dwt.h b/libavcodec/dirac_dwt.h index e715e53bc4..adf5178714 100644 --- a/libavcodec/dirac_dwt.h +++ b/libavcodec/dirac_dwt.h @@ -117,16 +117,16 @@ void ff_spatial_idwt_slice2(DWTContext *d, int y); (b4 + ((-2*(b0+b8) + 10*(b1+b7) - 25*(b2+b6) + 81*(b3+b5) + 128) >> 8)) #define COMPOSE_DAUB97iL1(b0, b1, b2)\ - (b1 - ((int)(1817U*(b0 + b2) + 2048) >> 12)) + (b1 - ((int)(1817*(b0 + (unsigned)b2) + 2048) >> 12)) #define COMPOSE_DAUB97iH1(b0, b1, b2)\ - (b1 - ((int)( 113U*(b0 + b2) + 64) >> 7)) + (b1 - ((int)( 113*(b0 + (unsigned)b2) + 64) >> 7)) #define COMPOSE_DAUB97iL0(b0, b1, b2)\ - (b1 + ((int)( 217U*(b0 + b2) + 2048) >> 12)) + (b1 + ((int)( 217*(b0 + (unsigned)b2) + 2048) >> 12)) #define COMPOSE_DAUB97iH0(b0, b1, b2)\ - (b1 + ((int)(6497U*(b0 + b2) + 2048) >> 12)) + (b1 + ((int)(6497*(b0 + (unsigned)b2) + 2048) >> 12)) #endif /* AVCODEC_DWT_H */