From patchwork Sun Feb 18 19:29:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46354 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dda5:b0:19e:cdac:8cce with SMTP id kw37csp897672pzb; Sun, 18 Feb 2024 11:27:54 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCX/7SKbeEvRq3tugYQl6uTkZjoM1A2xpnm5D7MQ7oCLa1JP9hM8YcM6ReMblHvd9khl9OWzgy/MN3BgcuefC3VyyI4SSNShEvIn/A== X-Google-Smtp-Source: AGHT+IFprHNsMwzKGlEnraorFHE+x8+1J9wTioV/e9lNaGP4jpFETpZinEQz2EEp6EZGCH3M6BV+ X-Received: by 2002:a17:906:80d6:b0:a3e:8ea1:d76e with SMTP id a22-20020a17090680d600b00a3e8ea1d76emr706613ejx.54.1708284474035; Sun, 18 Feb 2024 11:27:54 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s7-20020a1709067b8700b00a3e40946d70si1142363ejo.780.2024.02.18.11.27.53; Sun, 18 Feb 2024 11:27:54 -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=@outlook.com header.s=selector1 header.b=hVfoQFJ4; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 23A9A68D38A; Sun, 18 Feb 2024 21:27:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2064.outbound.protection.outlook.com [40.92.74.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A33F668D245 for ; Sun, 18 Feb 2024 21:27:44 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ImkBcJVRDzuwoiLSG9pFGj6i6hP7nDWVLL59FJNhuS7nvuCozBBb4Q2Y8VkZpWDkZRJS1jCg7bIslfJyM6I2A7SV1ih+BL8MVxl8yMiE6IjPvERC0LgBSapenl0eQp3A8XLgCBW2rB+aTPNkB4Gp13FxnzkvbmrhSsUWZDXmzqERscJoaHIN73E3nGUGla952FzRrjmXmgxy+MPnmqgd444br+0L7RfI5FGuB9w/IyOBRgcpnTErCd7wQwT10QyQVdmO/Dgz96AfF7PioMu+23Pqmy4RgrbrcfGjX0TuL7XjRHriBkNZcFENIJR+m3u1OmmQ6BFiZOmSvbSSLwDHUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=irPAkRpUtbPcONTDjyc6m4DKKZyAo8PWh7cM+S2K84g=; b=Qhy/T5zkUJ9FMDS1LHzOCw9tiMpsxCXWmB4tQfE5mbUzzkoQPvZMrfI1FMCkuqCPAtGc/qEjFS47emP61SSiYC1KzhD7F69yH4uGO5OfMl6Jg6GfrNK1QM52hj3L83E2q79Mjsu5bFHpg09sRhUuNwDwdnVGEPfzlvAcJt8Nf3kmUZHIIXJq1mkWSefbvdduvlJPAdGhcQE4k7bVAnzuiAg3BUYGNeUrLpLK1g6409aMsSNuNzhjgRS3HGLcGiSQ8T4tfJoVvjOhI8+CTVlTsPezw1N5Q3DOnz2BS+bhnlqvR3vl+Bo5+aGjijdNIceNqNCWaR3UKiAbU/UkpeXTJA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=irPAkRpUtbPcONTDjyc6m4DKKZyAo8PWh7cM+S2K84g=; b=hVfoQFJ4QFiTmGz3E96gSZtTjfRVpb09KLtIX/ZML7WrnOAaAzonbO7DtxlCUUaC6PaftrsCx80ZAeuErV2jV4J99obrSUUJs8wQqmhs2CrG5SDNol2lkpBhVBgsfFCFmk+kefov74IIGC+smuvkkwXYh7lVDib+NXdHnJOAw/BGibkCrp9Kdzg7FCjM/hUSPF4371WZl3F68Q0pIJ6QJnJHw0V7lLZetZVfiMV9kbo8JucrltbV1vfnnvDrpGvqksQK2H1P6iSFKdJn+ZFrRzQeN104wo1XG6nRsCOAptAiXQm5faLVqn8WM/NeNK31NWbiNxqTUFjziHn3cim/fw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PAXP250MB0423.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:288::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.32; Sun, 18 Feb 2024 19:27:42 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7292.033; Sun, 18 Feb 2024 19:27:42 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Feb 2024 20:29:30 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [+ehk0W7hYDc/HSED7zn69KRjN1b4fKQXKM90u2B9F/I=] X-ClientProxiedBy: FR3P281CA0056.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::6) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240218192933.346164-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PAXP250MB0423:EE_ X-MS-Office365-Filtering-Correlation-Id: bf327c00-6f77-4aeb-f467-08dc30b7ad68 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DBoZeXxRli+p2zCRPlr3dRBabkXLUqG8673v8/2jcwZJjRifNhhESrxPX5IlrwQBE1U256tF27WK0ngsDEIgJi9OMTQ4+T0KARJjYHJAmOj0mv9Y17FE45K0PzFSyDIuFDBBxWPpLebxWW08/+wyJU9CYnR23NVTKeEjQC+RbeOD2qkm6MEDCBz64Y7PXijvgN8he2cQoBbwFMKNQaPTZqggGkFTm554Wj+NIhkQ/AfHME61rU391d1+a5ZVG8dLR2xmpf7QLwTocAcZ/nr0c9XOGnZVJ+rcp7UIyW/Qi+JPvq6Pzk5V+n0r/7AQ9Zgb9wy667R6TIxD2SAj3+sZb97hAPZUOkbi/1ouOeToT2oucx55y450BVPe4UbZHZ7I5d/UoWZeBdM0Hji2UE8uPPelq6Qilqvgko5nAcGu6lsQgMgIFgkOXSS2+Mp13JLZ3lWD1CIb99QSHGgRE9aNHNdd6Rd63MkQXkHOYYk9rpfniA/BTUh4CARSg1arFxOsLg2x2WyQ6UHFqyenrEI3T1AFiVKZR87tkCpvc7UMUs3O1gyLujHmMrUzvrbc/Of+4Ilo/cky+OxvyR4PEc/gxaGCCN8UUG70t9ydd6E3YXwqsxQdRkkekvwveZXIbmd+ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0osP1CTyJhc2BbLFZI1u8jMLFRmVhkT/gx8jEuNMDsruaUWl+aIEgufzhmmIe9Z+ktp3X3N2xDLf4J33Qy/XD6yKyb9bSE2KUrdgH03d4saUamXl8JAPbBv3DYAKC9LQOIUHwMb+emLfYcRMk7ZJWYgZWgNpMdQdumOKapV2ZaR9f1vFpU5GI7tl5keQF7AkYCd1b9xfvJ8Ug0k94IbsydzzM6JyxRD+PLFgOF7alpP0Li+1E0Z5lzpLcV/btQyEktKfE1jlFAFPAh/s9p6cJyTmX+bwvlaQvrgPmWOeSjY4FvwChvCZ+NVHj9ithXljwOC2exC9t3pKOykYDEgpwcq0igKywil1tezGk3pF75GV7FQte+c6+nR9Q9pXvyWLtfySGSOgEndomrw7l9xp6STdok86lEuMtjmjgx2GGby0Lqb5JKEkhOlz4GWbskbcJC8kMIm7qbFMNxSevBIRFNzGpqfAFMcFOGKe3LV0b3P9kBs8WG3DtJRqeos2NzzWwbNHhWMl85iTNPWjOjZaJk0Kef2x5Ue7ijj+FxgkICtntb52i50W8SqK4Vi1IM1wjWvklYrFpDPCW10+qShkEz5MozJeT5VNg8bl1N8AzSClbZ7i8UqiGrHfInCAzL77KTYYHLv3EP6Ska09sr+gBypvp9MebmIxv5k7lMyRtYfNMytESNkXd53DUrB7/2jsa7kAESKE8B8a0iULL87iBaMnJ1QVBztvrv/9riqffO5IF/YGOoHxPQr+37CG5ByO2709W2AIfW17z0j4sG24ga11cSeXzsN2GVJQsxZ+P3uRefYy/Fv3qPXAv/NYKeepHBGdwDlS44wK2LdaVkcMXVKCX7AETqV27Kx5COAgVyb5NDd/LpFXIE4SM3sAx75jojbXYnl/gt3MT/WyQ+EX+pyfirjkZ4Yjye+PmmvYt7/g1L7h0uNHYCZwslIoymgYr50UmfGRkfip9BVy02W5ywn43/nKkoL4maXfGs5IiAQeKSwF6htaz5GwUqopxHItYJBLqwD/S2BR1sPIn4vRVzeYqJmseSU9AyUM0VDrvx8j5kwOOj41J0/XnMEBP2SL0OT8skiM+Gxqa1Q3VOnX9LvTnCn9SHOJ5Dt4rZYknB/+46E6pfCeJngJ14JZ5zAZbPLbkMxiyhrB4zSRYhWotNKwQa/SeoTqv5lXetMuZ3plsEcTbZbEa5GrOq27/G6tLn5jAa3l5jzhK+OiEXFWtESYYkDwb2ZA86WwowZ8MQLN5q4ne0PGGS6tQi2sFebNQYAJqEFYI4JBlNqf+eG4Lw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bf327c00-6f77-4aeb-f467-08dc30b7ad68 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2024 19:27:42.8059 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXP250MB0423 Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/vvc/vvc_ps: Check before access 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: bQuVQ1qTNnYd max_bin_idx can be at most LMCS_MAX_BIN_SIZE - 1 here, so pivot[LCMS_MAX_BIN_SIZE + 1] may be accessed, but pivot has only LCMS_MAX_BIN_SIZE + 1 elements (unless the values of pivot were so that it is always assured that pivot[LCMS_MAX_BIN_SIZE] is always < sample (which it is iff it is always < 2^bit_depth - 1)). So reorder the checks. Signed-off-by: Andreas Rheinhardt --- I don't know whether this can be triggered at all. libavcodec/vvc/vvc_ps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vvc/vvc_ps.c b/libavcodec/vvc/vvc_ps.c index 53a86321d6..376027ed81 100644 --- a/libavcodec/vvc/vvc_ps.c +++ b/libavcodec/vvc/vvc_ps.c @@ -652,7 +652,7 @@ static int lmcs_derive_lut(VVCLMCS *lmcs, const H266RawAPS *rlmcs, const H266Raw i = lmcs->min_bin_idx; for (uint16_t sample = 0; sample < max; sample++) { uint16_t inv_sample; - while (sample >= lmcs->pivot[i + 1] && i <= lmcs->max_bin_idx) + while (i <= lmcs->max_bin_idx && sample >= lmcs->pivot[i + 1]) i++; inv_sample = lmcs_derive_lut_sample(sample, input_pivot, lmcs->pivot,