From patchwork Sat Jul 29 14:27:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 4504 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.85 with SMTP id 82csp356074vsb; Sat, 29 Jul 2017 07:28:14 -0700 (PDT) X-Received: by 10.223.139.219 with SMTP id w27mr8189103wra.146.1501338494826; Sat, 29 Jul 2017 07:28:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501338494; cv=none; d=google.com; s=arc-20160816; b=Kz1aKRHJzGyBhfglFogVt9rElIhReiahRpJAsPh0CZ+cwmxCBx+nrSZSN0LXkyiGXD ALBENJvC2xHhTS8/WN6vlztUkMbtr5N2Q2pdKdN6bHjUyzaFDuTx8HBvIU6IDtASvxu4 e9CKUdg6NhMAY1rKLpvSrbFticrastWMqALA4HeldAUtguuLJCrvDfklqWRWNTgFlRku VPzasy1gyODOsA2GZlU1F7itDYxek+8wCbaRj1JWZPoQYoL4/eMt9VZx5fapmPN8RJJX P5sjdUzH7DBonSZPvTNe0m043OVrgpolvFX9btu0DGZcqljbp8lZctA6QPJ9ZYAFuNfx UOEQ== 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=QpmRgMMMiRw+M7+le/hErLw2Ov8EFb2nVBEIDbypvX4=; b=BMBVngGnAz5/fVmyMrWlDr+FAWQmOkbimtLTbsLc6wCKP/oQ0BdB610yhiaLTqe91T UzNpDzfiVizp5wpCvyZ8GOiAHwQ5P614iGnPFF7jXCbUUh+3ZlZUsFpZaf6szbcM+GNl f5N74rnuPWkA65fGv8VEgKwzPVpvOzqp8Y+gFsnbZTsFPO41UApnf0qbcO2N/haPZ0AH R0nI7FkwAmAC5g0zICqbx7v2D5nEwWlkHcuuVkyZUEHS6VLOAlK/ilm9mJe/GlANxBCI perg6S9p6suTGJ4DgtIqvcx2SBbW5VsAUGInOT2K45zHtswxqR3BOMnKCFygchL1/Ss6 JZig== 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 y2si22759772wrc.329.2017.07.29.07.28.14; Sat, 29 Jul 2017 07:28:14 -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 5A655689B08; Sat, 29 Jul 2017 17:28:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-1.mx.upcmail.net (vie01a-dmta-pe08-1.mx.upcmail.net [84.116.36.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3ACFE689B08 for ; Sat, 29 Jul 2017 17:28:03 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe08.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1dbSip-00081r-LB for ffmpeg-devel@ffmpeg.org; Sat, 29 Jul 2017 16:28:03 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id qeTu1v00y0S5wYM01eTvoT; Sat, 29 Jul 2017 16:27:55 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 29 Jul 2017 16:27:52 +0200 Message-Id: <20170729142752.23098-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170729142752.23098-1-michael@niedermayer.cc> References: <20170729142752.23098-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/diracdsp: fix integer overflow 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: 11 * 225726413 cannot be represented in type 'int' Fixes: 2764/clusterfuzz-testcase-minimized-5382561922547712 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/diracdsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/diracdsp.c b/libavcodec/diracdsp.c index cd1209e209..8bc79b788c 100644 --- a/libavcodec/diracdsp.c +++ b/libavcodec/diracdsp.c @@ -199,7 +199,7 @@ static void dequant_subband_ ## PX ## _c(uint8_t *src, uint8_t *dst, ptrdiff_t s for (i = 0; i < tot_h; i++) { \ c = *src_r++; \ sign = FFSIGN(c)*(!!c); \ - c = (FFABS(c)*qf + qs) >> 2; \ + c = (FFABS(c)*(unsigned)qf + qs) >> 2; \ *dst_r++ = c*sign; \ } \ src += tot_h << (sizeof(PX) >> 1); \