From patchwork Sat Feb 17 21:25:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 7622 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.1 with SMTP id c1csp2192954jai; Sat, 17 Feb 2018 13:25:35 -0800 (PST) X-Google-Smtp-Source: AH8x226lLqZ/45UnlJYYI0K40s2jllEAqOgRFri9BYAxTZKIWZcqxNj2GrLsA3NaXPy75v68s8S2 X-Received: by 10.223.186.83 with SMTP id t19mr8612174wrg.252.1518902735288; Sat, 17 Feb 2018 13:25:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518902735; cv=none; d=google.com; s=arc-20160816; b=Z6kCmW69jY97ACJviFUha0qBVEstMxpV3hC6XEFzmMsovVo7WgHCuYO8bUAYqetcc1 hCla9wy1MYDNM+KFEvRnxL2pi+prm6YEZpxxTMf4tDSyCqaxky4C9SC7nk2nm6EBN3i/ 65Wj4Vn44+v4iBqBn998WBjEvAbhyQZlNMtNz6XR3KIl80yQY0cIrnyFn4w0WyCKxNRJ VVtJyybgOH3ewQFmA4wrMqGOXyNeDeuBCqMuCGeBCKc80dyoigYqYrcZy9257uGv2Sho 1xxbR0uujINVBWNtgF3llDPFOwNoco11SSvlcYC33ef/TDbp2hvkJTSN0Wy4zexDZpee CoNQ== 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=0jQ4S9KmtF07Hf5uY3o3xELTEDUOb546ilxrh89RMZ8=; b=BgzLpo5DoSvVaTYPi2TGadp2jzvJQGK4wecJa7noOdg8OlmnoUA6XmCOn4+kVE+HHA 5VOLWVREn1aFqLLb4WU4O/Acn3il0/FqxYDAeaFOHirzGCWfnjzqpKlYNKN3DhM9O60q 5ZG3tB85+RD6DND+tS0XGnerzUegLmxIJtTghElxD89o5woLHsvfDlRrQxhFyTzzI5AZ +0M9XGY8lV6WH+o6usTXLAg9pepZuluQZ9Tb1vpVPS72Ig+XgEpLof27QvLNZI64EAgd w8y9GHW7XiKpOUHeXftaWzS+8+JJmoMlW0ujL6dlZWq/oktDMfRezKtDuK3SJYXeHs6X cZfg== 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 i7si7271198wrh.347.2018.02.17.13.25.35; Sat, 17 Feb 2018 13:25:35 -0800 (PST) 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 843F9689BAE; Sat, 17 Feb 2018 23:25:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe06-2.mx.upcmail.net (vie01a-dmta-pe06-2.mx.upcmail.net [84.116.36.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A05D6689796 for ; Sat, 17 Feb 2018 23:25:23 +0200 (EET) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe06.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1en9z0-0007G4-VK for ffmpeg-devel@ffmpeg.org; Sat, 17 Feb 2018 22:25:22 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id BxRE1x01S0S5wYM01xRFAY; Sat, 17 Feb 2018 22:25:15 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 17 Feb 2018 22:25:12 +0100 Message-Id: <20180217212512.18487-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180217212512.18487-1-michael@niedermayer.cc> References: <20180217212512.18487-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/dirac_dwt_template: Fix Integer overflow in horizontal_compose_dd137i() 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: 5894/clusterfuzz-testcase-minimized-5315325420634112 Fixes: runtime error: signed integer overflow: 2147483647 + 1 cannot be represented in type 'int' Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/dirac_dwt_template.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/dirac_dwt_template.c b/libavcodec/dirac_dwt_template.c index e68cc4d530..19c008b988 100644 --- a/libavcodec/dirac_dwt_template.c +++ b/libavcodec/dirac_dwt_template.c @@ -118,8 +118,8 @@ static void RENAME(horizontal_compose_dd137i)(uint8_t *_b, uint8_t *_tmp, int w) tmp[w2+1] = tmp[w2] = tmp[w2-1]; for (x = 0; x < w2; x++) { - b[2*x ] = (tmp[x] + 1)>>1; - b[2*x+1] = (COMPOSE_DD97iH0(tmp[x-1], tmp[x], b[x+w2], tmp[x+1], tmp[x+2]) + 1)>>1; + b[2*x ] = (tmp[x] + 1U)>>1; + b[2*x+1] = (COMPOSE_DD97iH0(tmp[x-1], tmp[x], b[x+w2], tmp[x+1], tmp[x+2]) + 1U)>>1; } }