From patchwork Thu Jul 11 23:34:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50492 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:2298:b0:482:c625:d099 with SMTP id fp24csp511624vqb; Thu, 11 Jul 2024 17:54:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVdVuX+sjleKZPTwylZ6EsbC81GOLsfkVul4/UXUXqbHPAdokfK3XfwX5OMcPWxdQ6jtPmq+A+VPD5B0UbO/EIks+h8Fv6alyuNGw== X-Google-Smtp-Source: AGHT+IHg8d0xvT5ZvlYGVFz4BHNRW2odWhBF9lsA/Fu5UB0GFuQRQfcdMxag3Ew4wYY2Y0UQdZTu X-Received: by 2002:ac2:5ec3:0:b0:52c:f521:9423 with SMTP id 2adb3069b0e04-52eb999b4d7mr5196607e87.26.1720745652520; Thu, 11 Jul 2024 17:54:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720745652; cv=none; d=google.com; s=arc-20160816; b=HZoe0EYSPdErHKPVCcj9Ajh/CDmKPPBOg5nu11KrS1sBMT4n6iEoLCoQvVrr+MNhYC axSX9z7As8ilxVoyJcVUQ5pnpqmFpIEE3XRlfrmN0MJrrnMp4q/2x6L9N7NYRlqQpD7u mazIxpuoVUL8AUtgR2qXmdz7vJHJ/hL8J3oIpDPZEeSDwNuerjXmOPiJCou9Ffr4tM6f xzfW9wUFTHAjgjlOZwrRKrTkUyVR1uGuSe3ri+fYbynWx2kEHoH7H23JWRhFBChsMsHr d10hMoq6ZUQ/xg4pP50+H/5YrP3D50hYCZU22xXAMlHGROHJtdTdgdrRORp2GSmhqjN1 VzwA== 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=DhG77v7tc2F5JSAp+tRHzbkPzUoz5HyzAkEV6MxYNP8=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=gL+K8Cxe5K5qwLlhsBtdjENB4Ph4mV/TlWgz05p6qG2zCfl5DMGaFyJR82rj0jGsCE C7xkJ7nsFCPG+ycYWhMZVWd9mytCYFU2CSIZDGI4CNJpOtw7Vp6z8YDiMsBKI0WAm5ZK 6Qs4tvcWD+xJGJMGeG+B6IFKWXs4kL1iGWdJosHNC1h6bsrYzlSMmin9SS++D/8rSq4S tzn25h3SztWtH9RjIGpKyXSrRdka68id6S+Qy0WWbX2MxuSsusjIExukHA1oSyWhFK9A r3+KsH+iVG+oj3Qsx65BLTEjCTiINUdfO7200U8OUcU6TgXCCR8Q+ogz5DU1j3Ry2vAF DaZw==; 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=XNyX0XET; 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 2adb3069b0e04-52eb9084ad5si2232462e87.543.2024.07.11.17.54.12; Thu, 11 Jul 2024 17:54: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=XNyX0XET; 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 1ECED68DCAA; Fri, 12 Jul 2024 02:34:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D2F4868DBCB for ; Fri, 12 Jul 2024 02:34:34 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id A7A4F60003 for ; Thu, 11 Jul 2024 23:34:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1720740873; 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=3TZa0cOxVvkbzSQV5hyDUvyvSVti8QVL5WC/UhZK7v8=; b=XNyX0XETdiaM0GbgZRlrz25K2wDXFDdvaTKuykXa8kvjHnLzQ5BlZLdXyxZGMBDME+Oq7T BX0seNshjBhxOgbKgcn8pYqCa6MRj0I70LLBg170nlrUKKZXExDnCmZk68QcidEznXpUnU tGn7fJRF5dQTYAqDq+4QFss/dunLnJTZN4t2fGNNM98A0MplxykusnWZFasCdXHCTvvmLP RqEZpbgfG3NN/LpuTINDTZ0jJqNpSXuXCa3rrCS9WR8LQoyqNIDkvpt4575QmKS0m5k/0P MAOEaRxXTIlpfonryF73SNThNonzyZ0sXDha+tSmsNT7dIEk+KNr1rgDYBerbw== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 12 Jul 2024 01:34:14 +0200 Message-ID: <20240711233417.1896879-20-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240711233417.1896879-1-michael@niedermayer.cc> References: <20240711233417.1896879-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 20/22] avutil/frame: Check log2_crop_align 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: UUP2Vc6vZgJ5 Fixes: CID1604586 Overflowed constant Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavutil/frame.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/frame.c b/libavutil/frame.c index 0775e2abd9d..673a9afb3bf 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -1107,7 +1107,7 @@ int av_frame_apply_cropping(AVFrame *frame, int flags) if (log2_crop_align < min_log2_align) return AVERROR_BUG; - if (min_log2_align < 5) { + if (min_log2_align < 5 && log2_crop_align != INT_MAX) { frame->crop_left &= ~((1 << (5 + log2_crop_align - min_log2_align)) - 1); calc_cropping_offsets(offsets, frame, desc); }