From patchwork Tue Feb 20 12:08:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 46391 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dda5:b0:19e:cdac:8cce with SMTP id kw37csp1806890pzb; Tue, 20 Feb 2024 04:09:42 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXZtKPFuu9Gv3xzRBOPh5X13FwgYly1AFfWgOVGQRTyQs3xFxZ/TMxluA4Hi1zbXk39WUc1PuD7Vr9pHnDWO745xBjgUDJ2JNKASw== X-Google-Smtp-Source: AGHT+IHU98hURZ0ezZQLmHewuohsGpiK9LFlYLbY/VCInAOWiMSnb4VaGm3rRqJWmS185rBgyJjE X-Received: by 2002:a17:906:7108:b0:a3e:ce5a:c0cd with SMTP id x8-20020a170906710800b00a3ece5ac0cdmr2514954ejj.12.1708430981939; Tue, 20 Feb 2024 04:09:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708430981; cv=none; d=google.com; s=arc-20160816; b=U8TRx3SP/3CfJZKW+0o763+gN1syu/tvIV39QnAleLVGqFqrlNnvUpKOrCD8hrPcgN VLrmRoubOT68YKkjLXGPmlFp7yc2CkbO/NtU9Ylv3dmQ7kwvt3PKA3uvLfDuwzpcngnj M9PlKdZgt/khyMgaDvw7ULUP2JnbNkS8kYKD4GZKCZ8b2h69J1NmCbRykTQyEuhOCG+8 qRQr2VxC0QLSm+Odq6VI0p0o4tI+Q89biQfiNyhhLWuAFQ26fQiTxWKp5fbzJMODi5sx K4y1Y4UVLmSnTQWB752/hJ4Q3xPUymw+f2reA4YaWMH20ecTOkE8g/o8Ct83420yO1SK h4aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=yyTi161IPVQxS1xBs/iUPlSEt6Q+arRoQCECy4dtJlI=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=i2bZMT/OhE6CBRvAMWt3thv9O+71gND/hu0CZ8j0OxTwRuf96TXNCMfn63NqsB9dsZ RsmFAv01i8i9DbNmCi020B37X3O6rkYTy5Mi5R3gMCznWMDk07ABm9NsxIU0J/mijSTW q5iG/fWWciohZ8iICfa8D3+1WpVIxOlG9BbAy6fEqyxXC53xhn9X5I6X5aenFXjtKC4O gVUporca3DPmg74UO1LCtdAjhcFceUqrvidqdQ/cje3LRqvVOild6TSjF3sRPYAWwZCF bgIOb1Qo8DEtZKZ9BzHYz4ABCcqYOJRj8mdIM7cAahdmvvebwyl9T8MT4aUBkPGGsSOk J8cg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=OaFYXbnU; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id mp18-20020a1709071b1200b00a3f16435aebsi148618ejc.80.2024.02.20.04.09.41; Tue, 20 Feb 2024 04:09:41 -0800 (PST) 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=@foxmail.com header.s=s201512 header.b=OaFYXbnU; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C30CE68D130; Tue, 20 Feb 2024 14:09:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-49.mail.qq.com (out162-62-57-49.mail.qq.com [162.62.57.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 65B1968CE0F for ; Tue, 20 Feb 2024 14:09:12 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1708430944; bh=WiH7NGB1Eh0hxPHHtoFrfCwpSblaNJ+kvA+Yp8jEcWA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=OaFYXbnUWLZLSBBl3JNbIxVVRcR1XbqMQ9+Llb0nAMoZeHDloJ8zfVhfiQ9UEJdrp IHHXwS7+XXecrMgAvO/cxD+LJR15Q1BjgZ4G/AzodLv720IaIP9IAJyx/kkUBA/Ata JGD71O2FgihYqZy93peKAqPMWkrlj8PwWNoH+pgc= Received: from localhost.localdomain ([113.116.31.63]) by newxmesmtplogicsvrszc5-0.qq.com (NewEsmtp) with SMTP id 2413D432; Tue, 20 Feb 2024 20:09:01 +0800 X-QQ-mid: xmsmtpt1708430943tloo8we9f Message-ID: X-QQ-XMAILINFO: Nq1uWKlIb9DMoLH7vsev77brs0aQq9++az62vt+931YV0tBRMWiL7rmeZ9mDjb GHKAMgr/6DG54IMyl7egstVntmnV/+/AQHcCnbx2/spRcCZKDjeNS9YoMCxSYgy36VOuc3fDeVVF jiaTcQQkJC6mHfvChLPyNeH5LJNHgg1bFsdt2P//dGHm/w/8bH35a6nov+5/91+W90M9/iawCt3J wH/kGz8luNqFecMkSJfCsXuG6bUvaFiJsQTR2yKbhbEVIs/Jy5L1YAhU8hGi3XTucpEJiw4xk02F OeW52mGvtJpsTvSdswLRPQmq8vQt/9Xlc/8WLD8R35NykS1qlEC+dj2ExLIzzVop+C0tuk74ok2E MtodyAO0AV8BPbE8cC2ePkzkRkwmt9rMxpY8TfXZb+4NpehZLH/AIoolndRNkDM5QWotutIOp/u+ MBNy1dvTee8y3+N5oYNgqnLcv7mUEblDBcMIxFq68a1pBduV+YHPJLv+d2l0Le9KbH6Ro/zbd8sM 7+wKTvkxuqIrTLPHRSx7ZIp2aUAG6egCljzDhBdIRxle+CCIpKKXPIYrgIgiKbjf2TrhCXTMbj/S QR3UdsQna7EQxW+zjLWSIC5CDiSFucU9TTKsJN+lp+1XeTKyC2gr9IzVPPnNMW5QcE6UthQUKvAj iEAzcI7X7+MGp5vUT2yO3323AIFf4ncKpAtyNjYOXzhKnkn4vAAhLkbQTcdvZZ9s6B8LCOfQCOmx kNDynY58ozpFvo1wleQIOLEE2XdRENF7FXR1hQgwb2VTZZ61t9hfgAc5/y1ODKgNX0j+eWd7QqUh VG4U14/WlN+jZqz/XqhNhDMP2JVtjXxMq5EL7j2Hwjp9y6XDySw/a7qUONxKoxh9c7Fosrby8+CB D9Oq6caUzvFPe+AeBFA8erSubhXmONmfDvv8C/4DeVJQwHnI5kgeqXp7/ovIk3nwyWo70fHq6i19 HqUOsYwhmgtyh7Ch/uV5NJDYvZfCRy+ypuulc/L5ApTWciSs3Pvji/0oPUpXwAD8E4M5HyhLdQjG zZ4qk3FQ== X-QQ-XMRINFO: M/715EihBoGSf6IYSX1iLFg= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Feb 2024 20:08:58 +0800 X-OQ-MSGID: <20240220120858.317766-5-quinkblack@foxmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240220120858.317766-1-quinkblack@foxmail.com> References: <20240220120858.317766-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/5] avutil/vulkan: avoid overreads in ff_vk_count_images 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 Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ADTAPHVLlps1 From: Zhao Zhili --- libavutil/vulkan.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/vulkan.h b/libavutil/vulkan.h index b666841836..a5e78760d7 100644 --- a/libavutil/vulkan.h +++ b/libavutil/vulkan.h @@ -271,7 +271,7 @@ typedef struct FFVulkanContext { static inline int ff_vk_count_images(AVVkFrame *f) { int cnt = 0; - while (f->img[cnt]) + while (cnt < FF_ARRAY_ELEMS(f->img) && f->img[cnt]) cnt++; return cnt;