From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id EB70549824 for ; Mon, 19 Feb 2024 23:24:39 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4812968D448; Tue, 20 Feb 2024 01:24:38 +0200 (EET) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2097.outbound.protection.outlook.com [40.92.89.97]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 71CCD68D40D for ; Tue, 20 Feb 2024 01:24:37 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a192w7xOEzuBb+C83iq7ElxNH7qQDl6O1siZEibF9CFssDoqA8H0kniRDkr0lygqHwDW9mnLaJSN0cmo5aB3+MTNRWngmsBbtWavwNpeEj5W9SKeqIsC1g/CXRF/pXTpUOrYF3Su1uGLiXKq2iW4Ws/0DQHX22r3U0GkqcxWLsKF5UXNxP+Eo+m4vp5aH3vyqMWGIkB+8CDbru3xl5qOuisjeTaQw/RWfOHpEaNh+ZWVDDxzLPbfb0CujnqeF9ZFKCS2hwWOwT5cDC6zSu9Zyk50Aj4r60UxjPbj3nZfzDT+56H1/bx9qZRxXRrjrNR8fNNtCDExUUJpVucLY4+KzQ== 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=hcnVGs5T4JW62J8YMfX4orIAWyeTb1WkH3seXCmN9QQ=; b=F5KdEnuD9SGpTXxUQ6iglFBC5+cozkFeCjlydLx5mzEbwkvxeQQi++iFsb+YRtE0ae3HwuJuETm4ArWUl97aMHT15AK6Kf28UUC8fYwnMT4ICBJPkdlliHpodVFkbnk3qVbM4ijDMDwG7X/VT9qE8H6JO+u2B4/QpleewKjDy/b66Ce8pX3/ZHYImFG4m+DK+jJXQDK7p+trpPKob2OxWG/zIzpCHM81/4w/YZTH6gYGElq0DZRtiUofDUSjX1a45J2KIm2kkRfGMqRB8RLF5QHgT6+C13sTyGB/YqmQuzF77e1p8oYGNFSdLV464vWRyMYLqukf+f73nzORHsBuEQ== 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=hcnVGs5T4JW62J8YMfX4orIAWyeTb1WkH3seXCmN9QQ=; b=uf94AD9Zbab11bqQnPQjw/7PSr944k5j0Zs/OAvCXxOQyJ4NTwFbBkwUQSR2R+67QVHAAbPbzIGdjb1GTKsSscqEwS1JS7svdXp4TZe4Ld6VM7QpS+36D3UALcKYCAX9pZFOzcXAsV3FC2Ch0K97VoQQ7xV5elhhUxRLPPf11Q2bLSyyBd+ODVPrlOe2+pLKILFxNIaMfd+ledG/1+f/sR4MBNYXb/PWR7cKAeDDCMOMdxx23ZuuH7X+0N2caqkqKB15pqWKbLXzuSmFv0CBo+81cuCN1X5il92L8vezvoVJ8NRz9SS2UFrWCIHt/up+3/9HI2fCtyS6tLxNloLtcw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0203.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37a::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.38; Mon, 19 Feb 2024 23:24:35 +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; Mon, 19 Feb 2024 23:24:35 +0000 Message-ID: Date: Tue, 20 Feb 2024 00:26:32 +0100 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [X7iSms8p+Hu7/S1uqMS0FIet32dX+VkZ/2n2EGu16Uw=] X-ClientProxiedBy: ZR2P278CA0045.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:47::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <2cdc02b0-f191-4549-a9f0-06acf7b137fa@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0203:EE_ X-MS-Office365-Filtering-Correlation-Id: 54bff27e-2707-4544-2971-08dc31a1ef4b X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0nELBb3AO0IAWBpL85gB5L45p5O7QCCniKsWK9/r5jvsSjl4mTN6/28b18iAz4pDZAWD8rqRD23xVrgxRAPg9lXxst0fot4tYbddb8a1xY1tgHvrHJTndl893AbkQF55L7KPAWFA7r/57ih2vP+si3gGNglOKSNhu4Cg+BjlyAeU8acLUWVaaWkjNk+9FNewnwAGVJn2ctDZmWvpncmdV8WeGkqlV8O+fQzPyHKbW3gpktrgWlwvSCKg77kb5hwBxv8FvEZF9eKOVpr2ovOlnu3NW828AfIbB04sfxeaQK2jZfN6XoO6lkbebUmP37fbMp8mOH0+Z3fQ6zmvvwVu7cGzEYkD1FdU50+KBhfyaIOEoGMXNLL8AS4htZChDA1L/0VLWcMke8dHEhWIV78eKLIpYSbpBf3nvpBOva9ojCoPZm+mus48DZcTk89gr3UQPLKzTCqLpLdiewooD3x6/Cmciwb7v28dpZNEodPLtKovNVWn88MBg3EWugi16Vff3E8SlEUjyKe9tQIqq9y7EHfv5u0cAYRRNfzVWPNEjjWr1JknBnWwwQO5GIWqxUYT X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZjBsSWttTElmU0MwT1JMZnhvZzhoZVhJV1dyMGQ0K2NCbXc3bERDc3NrNUpw?= =?utf-8?B?Tk5PUTdZcWkxVUFwUTJKQkxXWjNNSk1BN2U3Y2tPRW84dFJoR3g5bGRwcWpm?= =?utf-8?B?RlNRVmcvNjZsWXpUVHIwV2JoblBvTWtrNnZDVVFZcUJhcGgrRnplOGYyMHRR?= =?utf-8?B?YlZXdTJJN1M3K1pZQUYrYlNWdWtOczc0TlM4MUt1TEE5NHBrTzkwZlFOSHd1?= =?utf-8?B?TElYdWNzYlBIMkxMZlkxL2pQTlpaM3dDdWtxb2ord1BCY1d5U1BhMWRWYjRQ?= =?utf-8?B?azdMNk9raFVBY3VmbndJZ0N6VDRDT1dlRmd4VlNMbDJiSStic1VXSzdBM2Uz?= =?utf-8?B?L29EMmI1a2tXWk1LR2ovdEwzSlVlaFYraWFFanRSckJQZ1pkOFJIbUp3M3NE?= =?utf-8?B?RUJ6VWJpcjErVS93OHJmMHBpQ1FOQzBvTEZFUEtWSDZNS0V1S1AxdlRMcWxR?= =?utf-8?B?dVdnME9LeTJ0OHJHUHFaRzJtdEFrVnRHaXBCVlp6S0tNOVlzQU1uUVB5bitP?= =?utf-8?B?dmVldHVvTGVleklLek8vM2g2WHF3RmVGNmVoQXFmMDVuc00vd1NURkhQY2Ew?= =?utf-8?B?aXljSFN0RW9mdFF2ZG9oSVd5em1TM3Iwc2xnaXpIMmtaRU9WdFVpcE82MWk5?= =?utf-8?B?OXZaT1UvanNSd3R3YTF3TTFocStvYzkrTkY5OXFNMkR5L29CUEdyaVJnM0ZH?= =?utf-8?B?aXptT0l1ZXEya2ZLL05QSHFqTzRYTUFyMXFoNHp3TFVlTHVWWEtRVmV3OHc4?= =?utf-8?B?Ni9GcDBOaEFiR3VFdGVyM3UvM2w0dmcwWW5VaDduQVpTcFQwSUl1NFJZUThY?= =?utf-8?B?d1lndjltNy9LUC9HSVRUd1VLa1IvYkFIbFM0YkNmN2FzaUhjZk5iMmJXYk9S?= =?utf-8?B?L1U5bUlKU0RHTlhHVFhkeTBMOTdINjYzRTYxNHNnMUdkcWFTZUQ3Rnhod1Fi?= =?utf-8?B?SmFQQTVFb2ZSMWh0VUV0SFZ5c2o4dHo5V0VnS3RJd2tnMzQyQm1QTU41MDdz?= =?utf-8?B?RUF4MnJKOEl6ZUNxUXVwT1Fuc05mYzZzWGlwc0k1WGJGUExKbCtNbUh3Qit2?= =?utf-8?B?Skc5Q0s3a0VBeDdXVlRNNmUwcVRjUXQ4RnE5NHpJZ1FEc1F1Vm9jd1N5YXlW?= =?utf-8?B?WFU0ZSs2cWtWa0JKRUVHZkY2L3ptenBVQzRZa2Z3S2FMYXlSTmJVbm5vdEpG?= =?utf-8?B?VE1rVVYvWEZUQVhEUStMVXR3aXZ4K2t1Z1VQQXdEb2dvLzNncU8rRDhMZ2dG?= =?utf-8?B?ektSSS9VRTZRTWlKWEpXQm5xVEpJSDVCemFOYmd2Y0ZicFIxamR5UGpXR3dE?= =?utf-8?B?UEszbEY5M3FmT01NTC96dnFkRGcrWjF0MHM2c2FMRUhQWkpHN1o3SUg4YnRw?= =?utf-8?B?S291Nk5iUExGOVRib080YXdYNDY0RkJ5UzltUXZZZGpRSGZFL0duTENxVlRJ?= =?utf-8?B?alk0THlNcVJDbGJkcWlmZTRRaUNIV05TZHZXMUZLekNLL1RNcW55RG9raVlh?= =?utf-8?B?dS91dWUydWJNWEIwTEJ4RkFxT2d0bHJJQ081bWpublAxai9iL2dxWkd0NjVL?= =?utf-8?B?U2FPYlg5bXozZGlHV0ozOThIbVFqRzdkQzVNVENBbEh3NEYraWJlTHZGRmZz?= =?utf-8?B?U3BjWWhEQ2ZSYm9VYjBMNnBOZkkvV2xoUFEzSlB4WC9Hems2dlczSEljTXBy?= =?utf-8?B?bVE3NmhaWERDNkdDaUZrNFUwOVc1RjRjZFdrbHVVV25JYVZlMGl4Y2Z3PT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 54bff27e-2707-4544-2971-08dc31a1ef4b X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2024 23:24:35.5494 (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: AS8P250MB0203 Subject: Re: [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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Andreas Rheinhardt: > 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, Will apply this patchset tomorrow unless there are objections. - Andreas _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".