From patchwork Tue Jul 9 11:37:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50437 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:fad:b0:482:c625:d099 with SMTP id kf13csp307922vqb; Tue, 9 Jul 2024 04:44:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWJNMUE+MWf2aWsTzAPY/DpgaaLAHPPhqKflR+NOJGUF8j4b7NBrGsYVBwgjfASKaTctJc4Xddk4Kr3g+SFeWZnjTX4oO1JNj4OIw== X-Google-Smtp-Source: AGHT+IGs4Cu9h2zDh82u5HuB5pTOx8W8FxoOj6m0qzAyvLT32OsLMFoXMYrNDM7AL+42q6GHnv3o X-Received: by 2002:a17:907:9492:b0:a77:dd1c:627a with SMTP id a640c23a62f3a-a780b68a25fmr191369766b.8.1720525448090; Tue, 09 Jul 2024 04:44:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720525448; cv=none; d=google.com; s=arc-20160816; b=pMTDAIo0CJAlFAlu2LRzPxJ3v0LmbL9Hk8gla9Fu4r/X1KW2AgVmjCwOh+ufmgLE/f LhktTzsDbjB/QReFSmvzbZvQul3ywxys+W6wU7/L3DAycOoS6ioCkEb/jOZ8vPP0M7Zg 1SOlQuFIzDFdx3GkjlQgWa3EkGKuogpIjVd3N/aiuDkmDTC9x9K5od6DV2WJwh0HpWNd EOHKhp7fCx3cN/TrQM+n1TwMq0cOzoS7BZ4uFd0X5HgV48bO751wAeKGeZIRcWMBwwtW F4VLdgA9rd4QcAKrtYBT9jeBpOBAtPJ8rvhC7O/p4RUKk+zX2PadzwcsLnaO7E3XXEI+ uLCg== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=IFy9JP8NSv1z9o0ZnFxn+/AmpCrG2O/AZOV1+w3NXNA=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=paLkt9oNu20EyOrJUUlAfsZ2546G8TLZam3rr6sEuk/UF7BjCVLAQRkZgAd/IPVGsq M17MiFkG/LuwQlsnnkcrhOoytaCl1YbROe3x9+Blrelaz8XGzM4Bk0+qCwGaVWi77Elw 7Xya4Neg49QypVWliMKC7oqsR+k8E/jXZ7uezq12wS3WbZVUG2hEHRxAzyqOMqujmfyd btzKsCI+e5O4+PbQ3WLUpV6qlYfzfXLmB70SpWLiNFNb7o+ma4G/2HN4deobIry5cVgq 65bsMZ7TSXiaJXA2wAkDg8vjJQVcsY9ZwoQbSIEINwneQKVb6zd5ayfkKYWB6T/PwnPj 2d1Q==; 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=BqklnAfd; 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-a780ab3141fsi91949366b.851.2024.07.09.04.44.07; Tue, 09 Jul 2024 04:44:08 -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=BqklnAfd; 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 8FFFB68DC9E; Tue, 9 Jul 2024 14:37:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 42A3068DC07 for ; Tue, 9 Jul 2024 14:37:13 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id A4E19C0006 for ; Tue, 9 Jul 2024 11:37:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1720525032; 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; bh=IECNZBhRvuK7h6N4wLrKfCOJt8culz8SPtiZdENO3Ic=; b=BqklnAfdXU3mJnBX+TVzyGeCPX2axVc2f1Nynp42cNPobGg/TL1gfyOagu12H/00AGWyCu oSEdYMGiFVMh+RBVr2uRahnU2WdQ7OuExw96D1FKFhZkmVhSVv8xQaoEHj1SLFNeIjRuRU qqFMU47myG9erkQqPNC9u1S5qsInfgWVohME+KFWMcEPy3jA9kIi2XW4tHF8wwKG38ReYs KvQoyOsPDjnuiyYmErc0Qgu56Vv9+vdQnRrJGdcLUtvbQbkcAdQCJW1zFb5Z1nNNLsb7Qp 9W3coydcI1ekv9KVZI2hCO31/riMggcMZdA/ituO3lxxIa62XMx2xnUUeSJhHA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 9 Jul 2024 13:37:11 +0200 Message-ID: <20240709113711.1836747-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH v2] 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: qIgH/tlm/S8G 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..18e9393d6c1 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) > INT32_MAX || + (outlink->w * (int64_t)inlink->h) > INT32_MAX) av_log(ctx, AV_LOG_ERROR, "Rescaled value for width or height is too big.\n"); /* TODO: make algorithm configurable */