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 C4D574B68C for ; Fri, 12 Jul 2024 08:42:52 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D9A1468DBA0; Fri, 12 Jul 2024 11:42:49 +0300 (EEST) Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2068.outbound.protection.outlook.com [40.92.58.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2CF0E68D954 for ; Fri, 12 Jul 2024 11:42:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=CG0kDJaJz96GdvHn5NGYKZrZnmB3yC4xl6d1diSG5NZugvLbpZzIkH8YjVGfI+EYp/aqp5f5kKaPz5QeQ7oJu63O21RMqmDlruzcG10i2TZFL5ALj51iS3wrdBTD7sFs4303n/50bcvCnrOz6uJ+oU9jUEYDN2CmcFLosH2VJAcIuKKBbt7W8AxcbvckpKY1bHfO5OFO9TTg2Yy/KWHc1sMd9wwGHqunfiMGV63MAQ2Uh5Z/6d4AkFsnGmMDVlMf5pFPE+RO5XpYKjt130T6Xqqyj4njCNEzCjQsHoo9R9cuLkD0hFlSyHHfLBB7Rmo8QJYwyatebprRCnPyCI/hJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=0BPu3/ULg1wxrcFdoZIZFlPfMff+jxw4090ThdaodkE=; b=cHWLzhhFA2v2zQ64ruuMbIzFgfP40jdL/Mqi2mbLz2A9IdlRDcaJjGEzjpxGqnHJniRscoq7cEp/nZRQt0C1VMUhsj81JXmsH8kWK/izaGNxZgJuKY6wNM/WGnpr3MWX0wtBqHsqyc+t1LB4BoOe58QtvzrzEn+rL0sea50MfAXofvCcFYtwYupMf0EHc3IeeWmsOIvvfmfhUtzCYB5ORQ7ltJVOEZZ/ikh0bPbMp0A40+ylxkUsKr+6DfKg5aC316nZ2j5hRUkC8VKLAqHnSM6WP/mXPehiCgmvSaCWxMTGRzc2lpp+XKv+o1ENQOAfAj3ZR5GuljiaLjvVwt1hxw== 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=0BPu3/ULg1wxrcFdoZIZFlPfMff+jxw4090ThdaodkE=; b=cYxK7T1HVpPbKrQrOWUxR0m/ZfFORlXQAm4Eu9wT2Mu6/s7E9vCSpI6fCFlm4H0t/dBmgUzBC4Z2kyChq7nL/y1xIOby9oabK8Z5wnBDwUYWtfRB+Kk1z0E5jT4iqxkbsOSNZEISMeQxOh9/KucpetKqBSyrRDILoNCerXHdzGuWOcQtnS6IqX/DaJA0jvdrRmEeUk9SQ6b/ImikT8PLxRc4Y6KomhOhqCbC0P1SIoTU9mR4S14HHhk4JVOmIMhGn4+WJf9ijVsYZHuRa2sB1VYZ/obSI5tNqhppBePm8l5kABro5kJpbca2viF8EtAGnPKQD2ZL7WC9A3MBab05yQ== Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) by AM8P250MB0342.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:329::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.23; Fri, 12 Jul 2024 08:42:41 +0000 Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::1f36:56b3:1d04:c7a6]) by DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::1f36:56b3:1d04:c7a6%4]) with mapi id 15.20.7741.033; Fri, 12 Jul 2024 08:42:41 +0000 Message-ID: Date: Fri, 12 Jul 2024 10:42:38 +0200 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240711233417.1896879-1-michael@niedermayer.cc> <20240711233417.1896879-5-michael@niedermayer.cc> Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: <20240711233417.1896879-5-michael@niedermayer.cc> X-TMN: [n2gUlFt+Uv8oR3bPUJcuKgR4SgU6XRSAehf2jfb1xzk=] X-ClientProxiedBy: ZR0P278CA0007.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::17) To DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0P250MB0747:EE_|AM8P250MB0342:EE_ X-MS-Office365-Filtering-Correlation-Id: 3136a457-bb94-47a5-57d8-08dca24e9704 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199028|8060799006|19110799003|3412199025|440099028; X-Microsoft-Antispam-Message-Info: WRsi3Bbv6pijYJnJChZtl9nnSUQvLt630CbidzUVcHTB4eIkk9pKX6XqH9thVbL2gghjSZx7l7LBgBGORX6FV6AMJYZ/jM3eF2lXlwmDTLZ+gXRAJxVgOEa6AXqJul+tpp645Nf0F9BJ1NsjBSB1dn5uaj91oqB0H+K+HtTNIecP9seQLjsv4o2lyDUBrF2P/gA84x9e9uUnltKZuO6Nr65KdXrR3J/lCBPtEM2cqeWvK9cvJPVCrsluuxVjhcw+seJAiIEvaplDvB+xeqJnsc8vGfD0wtyuPyvJP/fkiLaZtBOaaUc8U+u4xqIsp8Rtqd0ysBZnZmw5YqmOQKu1NWOpH+2+uFSd9UOh2Hl4qLBojEAmH9rQbUz4l2bLqlj3pdWHd5wesE9/N4ucSvpHl7yO10PwL5TcFBod/QKC5oDk5xeS3TW8LOQpQUkVwnKp5jKR5y45+f7jyhTOGUzfN6mC5gh6Ehimvf7w1XGxJ2snQGwKG//n/LJSwYB53eESBiSYho52lpbCr/vripvh18foQGtb5dCJ069r2pZKzjCr60o2kIppkmK4xA/OpL+yeedni23BoLe1MPIv+qfduxQAn9TcqafIPPOmxRFWfKW5OtZV6J30vUe3Qmiojs3vBy7qaxM01jV6fb91rrWRpQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?c2tIMHpPcGNuZXhLVGN1dkF5ZTBYMC9wdkJqMFdjci9Hc2tBVlRTWmRTREky?= =?utf-8?B?TFhRT3ZPU1R4QnlYUW1jYktqbU5MbUhPVDQ4S2NDRnZWR3VMUGNrSlRPOVp3?= =?utf-8?B?YU8yV0dSUHZoVnJockkwQVVkN3JOeWVwMFJMZzVTdVJSNk5VeEFoc0gxQmkw?= =?utf-8?B?K3ZvRXVSV2xMQWFGTDZZSEx4dDVEVkMvdnRLbnJaZXJ2SnFOcUpuWE9IQnF3?= =?utf-8?B?aHVZcEFaMjdOZk14aTBHTXdXbW9LaThxc2dZUkRXSzE2Szc2MWw4blRCZ3hu?= =?utf-8?B?RGJJa3llQzBsam1zNENPclZwbHpHYjI0YkpETVR1L0JCNFhmalJxNmg2aEtK?= =?utf-8?B?N3YvVVdFTloxc2VIV2I4SndNZk1wRlVPQ0ljR2hpekRITldhbDkyczRENE5Z?= =?utf-8?B?TlNvWmRNOWE3L25xR3U1VWdqR09CWm96UCtUcU5jdC85WjIreU82QzQxdm9O?= =?utf-8?B?MHRhSUJDVUpUU1BFUzVMSWNiT3ZlalRlOVRrSEp3WFBJYXdvVUdGVkxtMDJh?= =?utf-8?B?dVRuZnBMMDVweTVxWlZIMXpZWTlVWldJK1dYTU02NGVlUGFWcGFCU0dXWUF0?= =?utf-8?B?OGhBOGhidWIwTXkzOHlWZnFoSjhpWk9LZW9SMjZNTE5IQndqdHJHYXlGSlBX?= =?utf-8?B?SHc3QWdab2RReU5rTGNEd3ZRRDRqODl6VjlyMTYvak43R3BUU1h2bnRCUzky?= =?utf-8?B?dlZ6Z2hKUk9MRlBCOW9ZNTRQRjJUUXZpbituVXJtZERJOG96b2NMbDVScktT?= =?utf-8?B?SU5vZXhIenF0a1lsUi9DQXN0bHdob2ZmdVdwZTlHenNCVGlBTkdlSkFMdUVB?= =?utf-8?B?MnBZMVd1VGEzeHBYT0xJdXoxVGp4OXduTVRJYVZUWFZpRjFiMjZucWdGemhN?= =?utf-8?B?UWE2Y2kvM0NncXJmRHl4TnB1NnlCZGNZblp3c25ya2gzWnVpa1g2dzVrK3Ew?= =?utf-8?B?NnFONmZaQkpVRUNjVWVMdGM1dytabVpHbm9yT1pBNUw3SjlaSUJNWkNsVmpK?= =?utf-8?B?UWMzRGdDM3lFYkFUb3dEMEkyR256ZWZJb2FNVXNOcHpydXcwOW5rUzl0Qkkw?= =?utf-8?B?OGVTbTBnQlVQUlNDRG5TQVBMZ1dQQWlseFVHcWJPYStteU9DdXRlaWJ3TWYr?= =?utf-8?B?Vk1DRHEyNWpOV1M0a05DRXlYTi8zNWVaZ011YWxlWWNEZVlIdzBPUjFTTkZG?= =?utf-8?B?N2dQbUpPV0Q5VUdpWXhLS0k1OFhRd2hNTWNZWkl2MFl6NzJLZVB4L0JKTFpT?= =?utf-8?B?ZUZpeVVNTDFDMXVnb1FmQjR1bXhIMkZYRlNVelBya3VqMjh3WHg3MUJLeFNX?= =?utf-8?B?VVZCcjV2WlB3S3pRMXkxa0ZrcmVjbEFFTFVOU3hwQ0F1OWFyVEhadzJlZlJk?= =?utf-8?B?Q0FDRnpNU05QWFB4dmp3VlQ4cWUrRWhkNnNEOG5TYkVaYVp1R3l0WGVnTWdG?= =?utf-8?B?V3pMU0hWeENUckZmWEZsNWVWaEg3aWs2ek5XRVZkMGVVS3RtQWNaMDlLcW1M?= =?utf-8?B?YkFnUDhQdDZNVkhxam9raUd6Z3pTK21mckZacWNsQXMyd0ZseHZML09xd09D?= =?utf-8?B?TVVvdzErZm85cFBEcS9hdW1HWFVBY1hOenZpL2hRdTZUR3BXWVFUeVJoeGN5?= =?utf-8?B?MmN5SmVFS2Z4WlpURTdNMWg3K05SMjZtVWJVKzc4NDNncjFTcUVXNHZIelVo?= =?utf-8?B?NGF0UlVaS0Q4ZHJPcmRLRnEyYzN3aVYyTVBQSmtiQjBsTUZScmRRcVdnPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3136a457-bb94-47a5-57d8-08dca24e9704 X-MS-Exchange-CrossTenant-AuthSource: DU0P250MB0747.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 08:42:40.9845 (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: AM8P250MB0342 Subject: Re: [FFmpeg-devel] [PATCH 05/22] avformat/matroskadec: Use int64_t size 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: Michael Niedermayer: > The length is 64bit that is passed into the functions. > Alternatively the values can be checked before cast > > Fixes: CID1604572 Overflowed return value > > Sponsored-by: Sovereign Tech Fund > Signed-off-by: Michael Niedermayer > --- > libavformat/matroskadec.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c > index aa28a37da4c..9914838698c 100644 > --- a/libavformat/matroskadec.c > +++ b/libavformat/matroskadec.c > @@ -989,7 +989,7 @@ static int ebml_read_length(MatroskaDemuxContext *matroska, AVIOContext *pb, > * Read the next element as an unsigned int. > * Returns NEEDS_CHECKING unless size == 0. > */ > -static int ebml_read_uint(AVIOContext *pb, int size, > +static int ebml_read_uint(AVIOContext *pb, int64_t size, > uint64_t default_value, uint64_t *num) > { > int n = 0; > @@ -1010,7 +1010,7 @@ static int ebml_read_uint(AVIOContext *pb, int size, > * Read the next element as a signed int. > * Returns NEEDS_CHECKING unless size == 0. > */ > -static int ebml_read_sint(AVIOContext *pb, int size, > +static int ebml_read_sint(AVIOContext *pb, int64_t size, > int64_t default_value, int64_t *num) > { > int n = 1; > @@ -1033,7 +1033,7 @@ static int ebml_read_sint(AVIOContext *pb, int size, > * Read the next element as a float. > * Returns 0 if size == 0, NEEDS_CHECKING or < 0 on obvious failure. > */ > -static int ebml_read_float(AVIOContext *pb, int size, > +static int ebml_read_float(AVIOContext *pb, int64_t size, > double default_value, double *num) > { > if (size == 0) { The values are already checked before that (via the max_lengths list). - 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".