From patchwork Mon Jul 8 22:24:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50425 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:fad:b0:482:c625:d099 with SMTP id kf13csp32609vqb; Mon, 8 Jul 2024 15:34:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWnuso73ksQhk9xImr6gnjSypPi3w7XkJQh31DdRFLAaIrfR1LIN5sbDnQMeAhavw61vRs4KrQ5mSgIsQ6kkuvdUjOzHQ/d5vyX+w== X-Google-Smtp-Source: AGHT+IH+9E6424l1Aip82oq1nNNh8vnZK7hVlG9lrmq2VFw9+V3QnMFJGRTGsCXU4BorZrf3B9Y4 X-Received: by 2002:a17:907:da7:b0:a72:7d5c:ace0 with SMTP id a640c23a62f3a-a780b68a294mr65202166b.11.1720478052068; Mon, 08 Jul 2024 15:34:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720478052; cv=none; d=google.com; s=arc-20160816; b=i+fk1CcPNrnPOmdSmMQfNmsX6s9NNCubVLzcAbZcjiM2Jde2VrCdaBFaMNFaP20TVp BB0TDWjNdzFoNC+SCuVg9MUdtrYgL2zZDiChXkf8QbtoYePzjzyONOW9FEbiSWX/kRk4 0ByLnN2zn2sZ2AJkSA9w1fDbh4NEiMe8DSuJHvdTFdIU9A1QpTxWSAgwd8PYOakqB2Mn 1R05mEJvR28VBDPaVkEZdaKTdS/ejQkkVDxcwYGA2PqIuWUFLAvUw4gN/A0gnAUPg77b maLKc5M/ryNK+M1LQPoVm4lXfSvD+l+nbWYW5lV1zA0yN9waocfKAKJC3mCiHJEKZn3z MgQA== 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=HC+VjfuJiK3S++JKXPrHgrGXu31iXsFVmd4CDZnyB4E=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=EePTiHEIsnQJLskJf8Hq3TdbJg6Dz6kc1bHOeIEhde+bN51m69FQG3ZQwMEmKvJgrI z61QvO1qU86w/zU9bFHswcwVwEw4BSiFCIZ6jsLqMqsqmKHZ2Gcz+NnFWpaf3FQgv7pG 1RXTk/wJe4DZM3L4CXyiR2ervOR5vXYNmPj0szVT396Y/P8bX+v0apUjoRBvd9umBTbN Iia71rKJqPKjY3QVqNtkrmZ0x6oGYPj5KuKqRFcMDVmUPUuaVNZygUeperQRMq2BIvNi AggRW+Bk81l0Ic2Ar0HkiI2poXu/2cPR0MISZpqJpGfWIkhm0dVK/E61JwFBEqS5pvCS evxA==; 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=X6MscEpN; 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-a780ab2c726si32931666b.771.2024.07.08.15.34.10; Mon, 08 Jul 2024 15:34:12 -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=X6MscEpN; 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 EBBEC68DA1D; Tue, 9 Jul 2024 01:24:31 +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 5C1A768DC18 for ; Tue, 9 Jul 2024 01:24:19 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 92F851BF204 for ; Mon, 8 Jul 2024 22:24:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1720477458; 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=0W1lVMhMnw9hAF+pvH7WyagEdkd5iAH7tbN6JJaYQ+I=; b=X6MscEpNs6kD240nlZ1tl+j9D32lLSjt7LAisjMFgpaBZJjpsCWVXaqZIP/ZcUemxbKH7G Sw98DY2ummOLJ1wxHbTE4wEd0NQCyxTkp5ksy5xM9O4CRj2eEhTlAGWdneQTnOL/584LFd ua01VC/5Z8NniOcDgiwOl9Zw9bodi6nSvVFjnEhtprqF5VlTM9SSWBqWyZjmZXxAbppDjV 9TMvekhlJuV6tkkCM6NjyPwP6+ypYDoLqDBjeAZ59CCSdNZqtOgJBDSH4eWDzlPs1d0Zg2 i72oAdKXACzLyT+08qwQQ/X6mQv+0SCVoCs3Xy27BBbyAZsjMX32gcuE/NsIZA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 9 Jul 2024 00:24:09 +0200 Message-ID: <20240708222410.773456-7-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 7/8] avfilter/vf_scale: Check ff_scale_adjust_dimensions() for failure 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: 7B6AU8X//BYa Helps: CID1513722 Operands don't affect result Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavfilter/vf_scale.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 841075193e6..bf09196e10d 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -638,10 +638,13 @@ static int config_props(AVFilterLink *outlink) outlink->w = scale->w; outlink->h = scale->h; - ff_scale_adjust_dimensions(inlink, &outlink->w, &outlink->h, + ret = ff_scale_adjust_dimensions(inlink, &outlink->w, &outlink->h, scale->force_original_aspect_ratio, scale->force_divisible_by); + if (ret < 0) + goto fail; + if (outlink->w > INT_MAX || outlink->h > INT_MAX || (outlink->h * inlink->w) > INT_MAX ||