From patchwork Mon Jul 2 18:45:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 9574 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp286022jad; Mon, 2 Jul 2018 11:46:25 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeqovhW65iNArATIuEJf2UMMkUC85QOb7aMwHQ9nU2dZbuS2+AOg6WD+7Yjn/6qJy27nbqz X-Received: by 2002:a1c:910f:: with SMTP id t15-v6mr181648wmd.51.1530557185470; Mon, 02 Jul 2018 11:46:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530557185; cv=none; d=google.com; s=arc-20160816; b=CsC9S9pjRiO2UpOvsf2TJPvcGS7q/c1PVHwhcIcAZNN5Ak2mWzSqowvXD6dYIXiO8j LJ5J1nA2qUpcGsAJgMALN/m3tA8GTXWsKCY6j8cSdnfjV9wWr/bqIcHJ2Xsj9ahtKMf2 2GmtqYRJkWfwbreBsI/Oa1LT21jk/LntVUUG/bQ76eKF4BB7Y8wARzVMoGQ2ZufS0VQd XD1UEc7t6y7qwzUPYHkKKRGNrzcTKz5vOKViIfyT3McxvH3MN7i73F2/jXejuCUhzzP5 FQQ2QxznDjHVy1zOwLG6WQpMuyyry0x36XV4MqqI03fphB5FBoGhuezUaDR+Pxb0EaEb 6tdQ== 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=U3WbKkFCdyD8d2+XBreu++Z2Z1SjEPvKoQ+yDd7c+Ek=; b=bR4kUeRjZuGxnqzQRmt2Q8hTtLrszZQJHo7PwaY6YPYc3vYt7raNdrZCgx5pMPSvs6 SS2VS5Ezve2lik5TyZSFVLOoaKOiHnQTORW47QKAmzsJ+mO0inIHbCF94mkHcEdSswRg MJS2sKhwvhqnbgUPpglm+WbYfEbVvq6c18jCCaDfC4zc+5sv60E7lMsN0Y+GtNJk+BKg V3ZYCWcypH4nQZjTJ3ioxtktPo2nanQAByJGQsF/znENpsc45VgDqajEujj8IguL9e+j qgNf2KUpNyh7f4EkExVH0Ad/NoUO/HZuhFQJNWHuFfx84lxn9HIEAVQyQrBNCXEApkx0 W0uA== 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 i7-v6si9912203wrr.301.2018.07.02.11.46.25; Mon, 02 Jul 2018 11:46:25 -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 0E91868A585; Mon, 2 Jul 2018 21:46:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe06-3.mx.upcmail.net (vie01a-dmta-pe06-3.mx.upcmail.net [84.116.36.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 18E4D68A4AB for ; Mon, 2 Jul 2018 21:46:04 +0300 (EEST) 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 1fa3pv-0004N3-7z for ffmpeg-devel@ffmpeg.org; Mon, 02 Jul 2018 20:46:07 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id 5um51y00M0S5wYM01um6eG; Mon, 02 Jul 2018 20:46:06 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 2 Jul 2018 20:45:11 +0200 Message-Id: <20180702184511.12534-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180702184511.12534-1-michael@niedermayer.cc> References: <20180702184511.12534-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/shorten: Fix undefined addition in shorten_decode_frame() 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: 1139785606 + 1454196085 cannot be represented in type 'int' Fixes: 8937/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SHORTEN_fuzzer-6202943597445120 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/shorten.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c index 79656e7757..0f491090fd 100644 --- a/libavcodec/shorten.c +++ b/libavcodec/shorten.c @@ -682,7 +682,7 @@ static int shorten_decode_frame(AVCodecContext *avctx, void *data, else { int32_t sum = (s->version < 2) ? 0 : s->nmean / 2; for (i = 0; i < s->nmean; i++) - sum += s->offset[channel][i]; + sum += (unsigned)s->offset[channel][i]; coffset = sum / s->nmean; if (s->version >= 2) coffset = s->bitshift == 0 ? coffset : coffset >> s->bitshift - 1 >> 1;