From patchwork Sun Jan 7 03:12:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 7175 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.78.2 with SMTP id r2csp1149417jaa; Sat, 6 Jan 2018 19:13:26 -0800 (PST) X-Google-Smtp-Source: ACJfBot4b7Nz/71N0J/akQPuTQmykodB78S4Rdadd2baujAoAaZD8MAAsd8ILP86BdJewB1X4GxZ X-Received: by 10.28.198.136 with SMTP id w130mr5515620wmf.75.1515294806675; Sat, 06 Jan 2018 19:13:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515294806; cv=none; d=google.com; s=arc-20160816; b=lxRLos/eC+Z1NUM3j0fglxHO5j4kxoPqaaDaK230RQmfpZ0ZKSYBopYPAZsU8WCSu4 YGFnt8XX4Hm4+iqjsAbCDNhOxo0SAqkYBrb/YyQ4YU2LHelny6bV8SV1WW5DA36jm81l +VUwLB0HxpyvPcqkcdnM43FPMg9Py7wYNVkzaYLaqXpWzKwF9bMLWshY1e6vfMv6Q6Mh Vzbwq3ZVx3PiYBmTuO50zKT9RdYayIbiaxJJ9jvJdt95ctzl09Ioe4ftAU39nKXFcZdO cFXoZ+qZJbOYX6B2b/N8ZlwYE5ujdGC9rsmlrUw/ew0E6qpPQraWbK0GUwTXtrk25G9W OqYw== 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=MsAzf1F7Ghsp6hAAj4/0Gfb0DFU0H6hjdCdmJ9rAja4=; b=Tm06MXla/t/bzsSIJV8vNOA2iJWz/JhtqnywrfIQm3QUtrFpnWBU0ciWllExuc9/3H XyvltVr0knR0NffDBI6kgmMYm228Km9lvieFVzUgYAL4drktb0d7NHhgp0RBJAuiRZ61 0zaaVfDFcVQSSR6Z451pZSNweZUps2Wn+RD1OqbcxYd41ROVBoWWonNXJcowYd3QBS/F 5bI3Wta0zTfEBc4e9vdCx01lrRk1VaLXxSKvRvF9m0F3R/pFBwTwTPNmr4bU8ny+JKlm qUJR52yA3CD5Z+DUsA6p9ol3gPh13i4rf8PkrlkMgYnSfRjtQGiDC+juBH4BbQio7acU XwlA== 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 r12si7065574wra.497.2018.01.06.19.13.26; Sat, 06 Jan 2018 19:13:26 -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 85C1A689DCE; Sun, 7 Jan 2018 05:13:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe08-1.mx.upcmail.net (vie01a-dmta-pe08-1.mx.upcmail.net [84.116.36.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 37C17689DC2 for ; Sun, 7 Jan 2018 05:13:10 +0200 (EET) 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 1eY1OY-0005tM-Bz for ffmpeg-devel@ffmpeg.org; Sun, 07 Jan 2018 04:13:10 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id vFD01w00D0S5wYM01FD1mx; Sun, 07 Jan 2018 04:13:01 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 7 Jan 2018 04:12:58 +0100 Message-Id: <20180107031258.12135-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180107031258.12135-1-michael@niedermayer.cc> References: <20180107031258.12135-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/h264addpx_template: Fixes integer overflows 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: signed integer overflow: 512 + 2147483491 cannot be represented in type 'int' Fixes: 4780/clusterfuzz-testcase-minimized-4709066174627840 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/h264addpx_template.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/libavcodec/h264addpx_template.c b/libavcodec/h264addpx_template.c index b71aaea439..9a1e6a2f2f 100644 --- a/libavcodec/h264addpx_template.c +++ b/libavcodec/h264addpx_template.c @@ -35,10 +35,10 @@ static void FUNCC(ff_h264_add_pixels4)(uint8_t *_dst, int16_t *_src, int stride) stride /= sizeof(pixel); for (i = 0; i < 4; i++) { - dst[0] += src[0]; - dst[1] += src[1]; - dst[2] += src[2]; - dst[3] += src[3]; + dst[0] += (unsigned)src[0]; + dst[1] += (unsigned)src[1]; + dst[2] += (unsigned)src[2]; + dst[3] += (unsigned)src[3]; dst += stride; src += 4; @@ -55,14 +55,14 @@ static void FUNCC(ff_h264_add_pixels8)(uint8_t *_dst, int16_t *_src, int stride) stride /= sizeof(pixel); for (i = 0; i < 8; i++) { - dst[0] += src[0]; - dst[1] += src[1]; - dst[2] += src[2]; - dst[3] += src[3]; - dst[4] += src[4]; - dst[5] += src[5]; - dst[6] += src[6]; - dst[7] += src[7]; + dst[0] += (unsigned)src[0]; + dst[1] += (unsigned)src[1]; + dst[2] += (unsigned)src[2]; + dst[3] += (unsigned)src[3]; + dst[4] += (unsigned)src[4]; + dst[5] += (unsigned)src[5]; + dst[6] += (unsigned)src[6]; + dst[7] += (unsigned)src[7]; dst += stride; src += 8;