From patchwork Mon Jul 8 22:24:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50424 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:fad:b0:482:c625:d099 with SMTP id kf13csp29335vqb; Mon, 8 Jul 2024 15:25:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV7YvOdujnetGXn9mXA6GvWGc0ZgRzS6C0v2pSkynfj3bWL5FuEtYdBcTgW68PySJGbB7UE20Be+i3nntRjVHuRPEl56VgzGuVYyw== X-Google-Smtp-Source: AGHT+IGsYgRJldlL9CWmrL+Ji1OA/XnZHCWHhudCw3T1ypCMCMRGx0Ya3wiPKzciFDC448JOS635 X-Received: by 2002:a17:906:d553:b0:a77:cf09:9c4c with SMTP id a640c23a62f3a-a780b89ec4emr65307066b.67.1720477526547; Mon, 08 Jul 2024 15:25:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720477526; cv=none; d=google.com; s=arc-20160816; b=w+JdP16rhct7GfJSEfytT8Guhi/t+/9ZbNKlwHIHmkICP1/bDsT7qHB3auM0hUiBD5 C1KCb2ICM0zi3/QOWsUJQiTTpneHRldLpUhSIT5vVdsWsnQBzvt5HDlG8RoynbJU8hyj xE+7xsi/ofrOtO3WYdz9AID1QRCpfWuY3Cser4SeC5VSUdxrfDAobH6pXZgr19gi15ir tkKHro6nL+DqmN0qKsDCU7TUT3WLylFx7jsLFMk97UftZOo5JW0IUIlh+WEmqyDy8F23 DwUegKirOyUViInyaX2qAeCrxXVewSBIZEZmoeqWPR3S3QkcGYfIbYT1YZ5KtOQq3+eK xudA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=na774DwjMHomotBRPSRBl6vhYr5weAd5hCAbyCNCb0s=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=EONacKiReTWUvvYoojw13cgrbgBKuZJiP45Rjq88wZBJmfT9oeaf1u4kBC+YEZ6bLZ ABZtr0+uE9hOaea9I+fObZ894+650EVJioaXVEfJ3CYDRwix8eslo56lTq4BdxSbkHLy zQCGiHXZYd5taE+s8UiS83OtKl8af7NuGFmraEQFhgZJW+K77rIq+jC3kMlMA5N0QDhE 4XmByRU1mmX1lh15UGShwjlTkotHXxkBtAV2rp32mCs3AGUThGS0NakMxxx+LIrAdWyp qjoYZb44qLWTwtTBZ1E378TbpQUPvpHXIf8dEmnFeGb1dMvVwIuL+HLUTpBBBFMZMvn+ zLAQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=Eu+w2OcU; 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 a640c23a62f3a-a780ab2cd9fsi31380166b.762.2024.07.08.15.25.26; Mon, 08 Jul 2024 15:25:26 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=Eu+w2OcU; 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 2F5EF68DC92; Tue, 9 Jul 2024 01:24:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0620268DC8E for ; Tue, 9 Jul 2024 01:24:19 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 4A0D7E0004 for ; Mon, 8 Jul 2024 22:24:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1720477459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LU2rn/xf0vBJRjASokmxZ9i0wE6HY4ChOQk/g6f8bcY=; b=Eu+w2OcUXpg+kxiN/+1QMgTX00wLJ41huL+xo8azJHCjvNyLysidXhYvsGV+QvkBnkBVU9 YCSXJauJGxlWrk/16fliQsBlLuPxWoKJ9gYQ0YCPfltu+K8T+AMUW2mdlWE6iYjpaWbxEH L+e+w4Ht21hr7QmHXfF1FMvt68Dz+utghkFOd1oSlIFtkqFOH01Arkc2/NkTmnIc2jz+6T u5aP+QLZdFHg1Bjia7iszjOxrGICrWAcx8gS1S6hb3eqc+ihZ5PTr/dvD0YW+f3Ke4rbgJ WaGc16HnY2Lf5ZcBwjb01DRpZpc6lJhf4zz0jp/ftsAYmT34wtlA2a+jZb1IAA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 9 Jul 2024 00:24:10 +0200 Message-ID: <20240708222410.773456-8-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240708222410.773456-1-michael@niedermayer.cc> References: <20240708222410.773456-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 8/8] avfilter/vf_scale: Cleanup some checks 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: in3j52ddZR79 Fixes: CID1513722 Operands don't affect result Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavfilter/vf_scale.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index bf09196e10d..120ff473f2e 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -645,10 +645,8 @@ static int config_props(AVFilterLink *outlink) if (ret < 0) goto fail; - if (outlink->w > INT_MAX || - outlink->h > INT_MAX || - (outlink->h * inlink->w) > INT_MAX || - (outlink->w * inlink->h) > INT_MAX) + if ((outlink->h * (int64_t)inlink->w) > INT_MAX || + (outlink->w * (int64_t)inlink->h) > INT_MAX) av_log(ctx, AV_LOG_ERROR, "Rescaled value for width or height is too big.\n"); /* TODO: make algorithm configurable */