From patchwork Thu Sep 21 18:09:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 43867 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:38a7:b0:15d:8365:d4b8 with SMTP id n39csp310107pzf; Thu, 21 Sep 2023 11:09:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFi0nuvpvWWxEU+UdrbZdO+bb14tzqhzlBWNsaRi9MsgIwilY8z5dMlX8izRTIeCWYO37ZO X-Received: by 2002:a17:906:76ca:b0:99b:ed44:1a79 with SMTP id q10-20020a17090676ca00b0099bed441a79mr5540981ejn.3.1695319775974; Thu, 21 Sep 2023 11:09:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695319775; cv=none; d=google.com; s=arc-20160816; b=nJ9e5Eoxxq0n7qPZHUUL3ES5eCiqnv6R4Cd/1BcDiq4Z/TeIh5tW9NKCNGHubOVFeu vzj/Nbu8edWt9ATvx3LjArJH8UBkIQ6ZXpahAUqt8UXt54z3foQKqa3R9Mf3O9wccr4F O9QqkSER23/voc5xJU/CJwRWuHVhhxm9YpV+9J55umQ8yfBLBMhnVU1+PiGwEpWKYtSo 8yxt1qgfcxuKhxGRCpIbd5iS3395v9R528uAOOuHDBLpUyQ+Lh7CITotgc5Dh2VkElCE wcgEvxTzDZRWCHoA529PN6DKO+4zF+W5I2boB2HxV5MEUzkaGcHJHKYmVahZFlwyaT9W +/uQ== 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; bh=HV3sqSgTVjWBj0kt9FU/P8rKeFQQR4MKQCgKwu0nqCE=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=eM2uQfbi70tCuBCcOU1QM5+AzCPnkZvakvurYsfBaO2Xc6Ftwt/h561WwPi46WybxV 6mvuCy8N1HHCfERIIE3enWCvA0qsxWAPgfLyX1qxtzSHTatoZjggxbY+OKlo03MDhSpn Tgw2zIm8zj4oJW9TdkPBzU1Si4OkuIryaTw2uGQJ8VQHlLYnwH2IHlBTTQbUkre3Wfwk MWQZjdxjD2C/Hp4IRjaKhO2PGgTpbrbPYcV2OVM6aVwyru4QfkebZUdKZJneOya9vGWc qd1mVJ9o+F0iU+uidd26wR5pOEEXNKGNgm8kkJpCN7LLd7OP0AORer6DWlejbvEf97IB O/5g== 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 l9-20020a170906230900b009ae09378e20si1740160eja.502.2023.09.21.11.09.35; Thu, 21 Sep 2023 11:09:35 -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 A024368C927; Thu, 21 Sep 2023 21:09:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E028668C8DD for ; Thu, 21 Sep 2023 21:09:14 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 3B05D1BF206 for ; Thu, 21 Sep 2023 18:09:13 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 21 Sep 2023 20:09:08 +0200 Message-Id: <20230921180912.10733-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230921180912.10733-1-michael@niedermayer.cc> References: <20230921180912.10733-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/6] avcodec/wavarc: Fix integer overflwo in do_stereo() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: mnnAmYiOSUVP Fixes: signed integer overflow: 148676193 - -2006512262 cannot be represented in type 'int' Fixes: 62164/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WAVARC_fuzzer-5963163952349184 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/wavarc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/wavarc.c b/libavcodec/wavarc.c index b954e8800cd..48c673fdea4 100644 --- a/libavcodec/wavarc.c +++ b/libavcodec/wavarc.c @@ -154,11 +154,11 @@ static void do_stereo(WavArcContext *s, int ch, int correlated, int len) } else { if (correlated) { for (int n = 0; n < nb_samples; n++) - s->samples[1][n + len] += s->samples[0][n + len]; + s->samples[1][n + len] += (unsigned)s->samples[0][n + len]; } for (int n = 0; n < len; n++) { s->pred[0][n] = s->samples[1][nb_samples + n]; - s->pred[1][n] = s->pred[0][n] - s->samples[0][nb_samples + n]; + s->pred[1][n] = s->pred[0][n] - (unsigned)s->samples[0][nb_samples + n]; } } }