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 DC10E48FC4 for ; Tue, 30 Jan 2024 22:17:46 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7020E68CCB5; Wed, 31 Jan 2024 00:17:45 +0200 (EET) Received: from EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02olkn2039.outbound.protection.outlook.com [40.92.48.39]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C8E4768C353 for ; Wed, 31 Jan 2024 00:17:38 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HL4REzxUkoHfcRNqNFURS5uT692z/LRQmMmJewHnPuWw6fQbsGQEAUpV65RtrGImPcig5lGc1Ab+zv+k/zK25q7vJZwOo4RVMSkM0AbtPx4deA+TaAPJw+tR/+kEnzmTRia/a1oXKrSOMt5Ps2tO948PcVQCsTvsIcsERa4Q0NdPGZseQ1tgfdzZRzUMsuKm+S7MfvK7Yqbpka7m8J8O+SZHgksVJxMm+N7+zOSED/MwOV40gNlIenc6JETdftdmaSKkt5IX2jKowH+IHWzjHdeoxWkcNP6LUhxg3wOjEa/nEHKMt8fEqSULEZrk4qzSYIQ73hLkLnihw9D+5ZdSrQ== 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=MOPuNzvi1F84wiScwwpFoZGS0gRfHfFpEEk6Jg41XUo=; b=bFyI0HpQXLyCGWiVnkz0+UZf6ShfjVuRi9Q/X6cuQqwPPOPn1i4aB/oo1rG1etR1ERcGWQ+9AkEWVkdr0EWUHGHW0lrAH5/1rDF6Q5QY5yE5Y1nuQ3k7KfUx68quXem3ZlhN6egU0l7uSEbuGCLJFH+ziLkNDgg1vVVuMNK4rbWzsaTPmf2vam3CUM76EF/jiUuIquu5mOGcuM5UzCae21CVZNrMCy4rKi3F8ogY2ZRvkwEUtUBDBqLOP5IAoyq/p3m1693i0w0ywIoCSBpszGVLZZq89P/8DmL8jDj8vNWas9tLmxaBgR7XehTp/vkZ/Px08q1L/3zgUItPcYKkhw== 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=MOPuNzvi1F84wiScwwpFoZGS0gRfHfFpEEk6Jg41XUo=; b=KDq3US50QN3T3O8YKUO4Fx9hIRyD9JXUYZihIms4MCARP0+XhNPMXVEzQCpTXVZhOyEj7rKbldmvFYtU8ZNe5f+SrB+pvUIj1H9rPjtf14BejAuWinYiFxmwRzQnhAZ8llTTIMekvR/pRjg+Gxxxj/5zyvQPF3+QDm2Jm9C8yCZDvniajxWcQyO6ROMKqgM8ZgekUXsAnus3Cql7C+wsqhrCCv+4jJV6PDw0XTJRgPiWs7BmKIGoJUaMwePO0+xnh+CyHxZIrVKnmRsEftZxgpHJVusss6ASXlN1hhoLReZiqUF0txJow4UnUDav84K9yzkWzklQ8es//sfzmeUN3g== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0384.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:239::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.23; Tue, 30 Jan 2024 22:17:37 +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.7202.031; Tue, 30 Jan 2024 22:17:36 +0000 Message-ID: Date: Tue, 30 Jan 2024 23:19:30 +0100 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20240130221612.970-1-jamrial@gmail.com> From: Andreas Rheinhardt In-Reply-To: <20240130221612.970-1-jamrial@gmail.com> X-TMN: [r+6ZGy5+lGcKiCXSAwxt8dfIstCrgtiHNSvGmyUjIjU=] X-ClientProxiedBy: FR0P281CA0084.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::23) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0384:EE_ X-MS-Office365-Filtering-Correlation-Id: 6b28a75c-7be8-4acf-24c5-08dc21e143ae X-MS-Exchange-SLBlob-MailProps: quCBMN2EvO/m9RyOkdsceXQhMj206Z9SwhLEhfTYyaGbRNLTtCBqm++T1rCUeOYgmvoJn7maJ6YDGlRDNRTJIwJXsqhGZb3be0RdIdOJTlubXQ0mx+Wsi6JHl34ePlOlLIfpqBWdgVDkbyemlMJ7A49/IacxRy1+BgXPLwjpMGXZf15G8CdEwLhtxaz//6ANnnDlPv/6zgC8NCb4Sxj/gYK1PaEDCtv4/r9GNrV+8bKNRZeAXsTvFXuyU52E8JqWjVVyfm0AkgIo8rvqjKjPav7X6w4G0tzCSeKPCEYVKiPbrPbOLj4DZW3YCPSPMWa08dKss4Zln7vGA6HO/dEI3k54I/2NjKccLw5t3RkewUEv70wavGDxVGiCfk/Slecu+I48yhTTfKviY0+V07NRvnkkZyFhdlwJIv4urwi1C4XRBAyj7Gwgaesy4j5TWDzzRB2qLg6mz3RzvCWKCeA19RC1SV7gj9WYGIRu2QcSyegFDpS2rEcsNlzXmWDZcQT8c56ZDF9vEAb9bDp7oAO5IAQhelzdG0TmCxYaGQtxsnUQHrnILtmNL3lsF7oszQiaT7IvDjTlV2BOK6yYQxvirzFbA3msa0vArYAjUGW0ltA/6H6IXUiPraS4orI4okFXtqZM7xZfl9Io/KYYjGkGiJSDPq24sO6EZ1gAHve++7ECnXwG2ObEsQbZP0gyfFXkhci5XdpJA+jJmdHiheaWLg== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MMdFa2pslKjm70NuEkS/YqNTEKceS2Nkra52eFouZp7sYaZ85yR7SYM+Ue8GugLTjdeLh91a9IkVDpIdI7DyejoLhPs8qoNNuKRMw8n4nk9Th2ltVggifI6VYaBuTgTmSPUiuWfsXv5HeZNx/Ee1GfBci3KqA8heBezEzAcq/evsdrWG44h8n9Lz82gBNOtjA3pYH0+ObsT0WQmLfjxqn+5YnOHChkK+vJ1fdOoI1vnbdmA8swIJ7zrQpQMGyn1qCUTK8t64g5K7xqlTDqVfpWC7KTbrNmPXBntB7m8wLCNexGxyNpJ90oZ7AI4VVuF2Dxl2iQQ3RWV0wCQ0U0BXp/Q+dJTsQ9KOZ8JjI97QAJB86C8lfJE0l/7CsfHCr8rHH5Zd8FJOzjdU26kt0at6hdreJ1wmMMZKgVYUgNTN6nXoHgiCoRnEgh/Woj1nA6602ovi4Xu4sBHzofL41Az9OkY800CdVL2Vtb+QqOq6qmL1ugE+uViGNoqOkUa3xJZsw+ELT0OR+kS2Udx0Aqgvohk9GVCZYzIdZFTfE50T+If3sUJFUMZyeiJV+UdpqtzK X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?T3g2ekR5WEZtQzZwYk4wM3FFaldOTXZiajFQUE0xYVZMTGMzTVlmY2hQc25H?= =?utf-8?B?amtDeEoya1lUdUhrNlNMQURkOWNoTm5nMzduRWdZL2c5dzZqSjg3blN0V2ZI?= =?utf-8?B?TkY4d0JRdjZRckR6TVYvUG9iYmtsWFVhRW9hNG94VXZZVS9KSThMUXdGRE1Y?= =?utf-8?B?RDZVWERFbVVLTEpsUHhIT3hFSTJaUHBDaEpybVdjaXJmeFR5UkIvRzA0SG1M?= =?utf-8?B?OXhmdC9ZYysrM3IxLzE0OUNFMURCeUVUajFNeXpmeFlsWmxWcW1iaEttNkY5?= =?utf-8?B?YlF6cGw1TVBCNEM0amtjM3c2UTVhQnB1RGx2WHlPZGJ1YjNETTVTMldrMWZa?= =?utf-8?B?RzVqc05JM1FZWFdUNTFzZXRqZW9vTm9MWklIQ0VNeloxRE9WUTgrYm55NmVt?= =?utf-8?B?bStzWGFJcE16OGh3Q1RPQmJBcnpkSWVpeVpOeWhpMG5hM1BZQkNLMTRrRmc1?= =?utf-8?B?Z3RLTU5ya2h2eDVRQUZ0YUs5WVBzWkVIZVlVVE0wM0FYWE5aUHAyVWJlVWZn?= =?utf-8?B?eC9mdE0vbUdWeWUxOHBtTFZVZlNmYkdmdmZWT2VkdE1Oc0RmenA2cGVlZTZW?= =?utf-8?B?K0tGcGFRTnJiNTlzWlRkci9rbjJBTGRoQUgzWUpNTmxXTXNKZWxTQ3h4WFhD?= =?utf-8?B?Rm8ySE5nUkNXWi9MS0pkNkZBZ2dQcUNvZVo2c3p5U2w3aTlFWXpnYlAxRllW?= =?utf-8?B?Z1FMc0Y0OVBlTHRSS1I0MnRTbWhweEZOS3R1ck1uU1d5MVNYaHhOK3RTSUc3?= =?utf-8?B?YnpIY0FjRVBhalVOaFBuTXc3ek54SUY0N1VnYWlZMG5SM3JhVXJhdGdoQUNm?= =?utf-8?B?Wmd6Yk1vMGU2ZTRVcVNOQ3phSVF1VldMTXdzWkxLTnMwVFQvZlkxL0hreEpK?= =?utf-8?B?MW1ReGZpZkxKaDQrd0VZZmJxTkNFRk9pamVZSlU2cWQ1cWNSYVlqNFovWmRh?= =?utf-8?B?enIxTTBqMGw0RENEMjk2S01xUmZUM1YweVZpTllqTTJvbWZmL0lTMUo0ZzBX?= =?utf-8?B?T0tudkJ3QkNJNXhVOG5zWmhCbTBMUHNuVTVreERjRVBXOENTUWttYW5ZOGx0?= =?utf-8?B?NjRvSk9iV05xVkFycG1TSFJzNzB5VHBQWVo5eUxhWHdocGVrdDNGVnRuN2xu?= =?utf-8?B?anRaZGJnbGd3d3NMMnpXNXRjeEN6RjZ1VjU2cW1URUFLTTRua3Z6ZGtYSUYz?= =?utf-8?B?dzRxay94NmRxTTcvQ21ST2Fma0wvczNweUpjNzlHMHpGVEdXWC9LSFNQSEU0?= =?utf-8?B?T0RiZnRaZGc2MlUwN1llVUQzRkVLYlY1V2hScFh4SnN1azF2YXNZS0RvdmN1?= =?utf-8?B?dUJEWGtlUjNDZ2ptY2Exai9sNHZTQ1pBaWNmZVM0cjNJd2F5MlZoTytVNmx4?= =?utf-8?B?N2M0SkpvSVNhMks3RkZyVnk2TzJ5WFVlaGVZRUFGeUFhRzFXbjRNdzFqaEEx?= =?utf-8?B?N3BDSGVicWpnZmRuUUhMWGg4a2tvdWI3ZjhvWkoxeGUrbUxrTXF5U2VwcndK?= =?utf-8?B?dDIvMjFQSkpMMk1ZSzc3MW1zZWJ6d25IdkJHZllSOGZLQjU2N0tSQ3ZuZ0d4?= =?utf-8?B?U3ROTW1RNkh4OEtScDlJTFBXUm1TeXRvTnprYWhaSDFnamR0UFg1cklaZGtr?= =?utf-8?B?dkt2L0Vmd0J2UDllREJ1RlBOblRBdnAxNkJuVmdPS1FGcVVkWDRDU1hGQTJN?= =?utf-8?Q?Z6XMn+ca+4MHZQ4+1rnd?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6b28a75c-7be8-4acf-24c5-08dc21e143ae X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2024 22:17:36.8126 (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: DU2P250MB0384 Subject: Re: [FFmpeg-devel] [PATCH] avcodec/get_bits: don't shift more bits than available in an unsigned with get_leb() 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: James Almer: > Signed-off-by: James Almer > --- > libavcodec/get_bits.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h > index 9e19d2a439..c0cc7c0a7d 100644 > --- a/libavcodec/get_bits.h > +++ b/libavcodec/get_bits.h > @@ -725,7 +725,7 @@ static inline unsigned get_leb(GetBitContext *s) { > int byte = get_bits(s, 8); > unsigned bits = byte & 0x7f; > more = byte & 0x80; > - if (i <= 4) > + if (i <= 3 || (i == 4 && bits < (1 << 4))) > leb |= bits << (i * 7); > if (++i == 8) > break; This truncates more bits than necessary, which is IMO against the documentation of this function. - 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".