From patchwork Tue Sep 20 23:22:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Kauffmann X-Patchwork-Id: 38121 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp2261549pzh; Tue, 20 Sep 2022 16:22:35 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6IV4OU1+LQS2HZv1XR8tONhpuY5+qsgwCduk5GNbLLOopzS4OTHko2RFQVklXIYOOKoneY X-Received: by 2002:a17:906:8a5b:b0:781:7009:965e with SMTP id gx27-20020a1709068a5b00b007817009965emr7823460ejc.625.1663716155773; Tue, 20 Sep 2022 16:22:35 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u9-20020a50eac9000000b0044f025c3827si936049edp.111.2022.09.20.16.22.34; Tue, 20 Sep 2022 16:22:35 -0700 (PDT) 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=@hotmail.com header.s=selector1 header.b=r7ss7aAZ; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1C54D68BAE5; Wed, 21 Sep 2022 02:22:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068014.outbound.protection.outlook.com [40.92.68.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E177E68B98B for ; Wed, 21 Sep 2022 02:22:24 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gLnnqNwjMmqgfL1ewuIDSc4s356i8+3uRJoNDLHQKCLNpowO5rXiah6Zp8C9ETWZxLZdsaQH8ogDP4U3V+iW1GbTUAmB3mj0ZshgA0YU3M36byTRIWLcPoMmv3j+FAr8ZGe+XbRyBZP3mWKSwiVbt8DieeugRTwZyEUSood/Dz3if7f+/JqX8s8IsZATsyYZJdej50I/jDXj/6BWjxGiJwFyMQvDYOLOjjq1PHkQeCG/X8BsGGSwXPbYIzcAk2vNrke+Kb1sHv03fEMIgyTfmvD7SIURlX9GsAce/xUYleBRLO1VRiPnN+q2qA/GOrQ90MIzWXluPmSagiF16tscKA== 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=POmG2pybmnvvVdLpanWZOMFwmqgfjbWsjDWPAkhz/PY=; b=Ym5hkQlRl7mDbE/1Xu8ngmNTu7v0FY871gJbHhEY9QOL5LP6200p+IWB1zauSwz6Y9qENvjXyC+R+psV1kz9Iwd+QuCqIKlYQiJ7GL5ECZw16jZwloM2IZexhh6vPVWBy+qtngPhSKEjdw5Y87xbs2HELciJuoRaO6pGn7JtE4T1S3ZDAtuE9Et4im26o26HBefvbQYeQPz5J9OmtwmMWjuXI87YjCb0taI86O/dowtfdfU6sYWlFoeXp0K2KMFNacl40TAg0S7/PVnosCl8yi1Ld1EjGSraPQTY+fy/HQ1xmX4ovW6J19N/LApKWFvEeQQdg+D+B0DteNsNU77yYg== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=POmG2pybmnvvVdLpanWZOMFwmqgfjbWsjDWPAkhz/PY=; b=r7ss7aAZ5UIc20xeZj0Wm8QeqxbvbVSVtciItgi61S3LyUL9JJA629jfqsnOAB4mH8J/ydB0DoCq0UxXuG3nePyC5Ouq4f04GEJmt39Yw9eEYCiQIun68NfIFxQI8Xm11tTqLLbb5hLUxlP15UWqMsc45O0mVAvscmB6gJSP081v5hVvayZ6sUeDLhAYawHvCx5FVAWZnl9F3Kt/erPf+hp0S6Ra8I/YnrxiAC4IJE4MEZowmcoBjtePwnsJ8FIdfskJLd236umLzXK+0zenbbAau8abzufL7Drp1nEIQagPcpY2eHkBXiPXgFvOeP3QJtUYiN19CtieHmZx99AhkA== Received: from DB6PR07MB3175.eurprd07.prod.outlook.com (2603:10a6:6:1d::12) by VI1PR0701MB6829.eurprd07.prod.outlook.com (2603:10a6:800:194::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.16; Tue, 20 Sep 2022 23:22:22 +0000 Received: from DB6PR07MB3175.eurprd07.prod.outlook.com ([fe80::3417:be7b:af2d:c2ca]) by DB6PR07MB3175.eurprd07.prod.outlook.com ([fe80::3417:be7b:af2d:c2ca%7]) with mapi id 15.20.5654.014; Tue, 20 Sep 2022 23:22:22 +0000 Message-ID: Date: Wed, 21 Sep 2022 01:22:21 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.2.2 From: Johannes Kauffmann To: ffmpeg-devel@ffmpeg.org Content-Language: en-US X-TMN: [hNSUjQo+klIGs2w5aUVp8bMkI3zoQ4gW] X-ClientProxiedBy: AM3PR07CA0065.eurprd07.prod.outlook.com (2603:10a6:207:4::23) To DB6PR07MB3175.eurprd07.prod.outlook.com (2603:10a6:6:1d::12) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB6PR07MB3175:EE_|VI1PR0701MB6829:EE_ X-MS-Office365-Filtering-Correlation-Id: 8c89fa98-e72c-4a15-8e4b-08da9b5ef847 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AjJcZYjt/8cxS8R0VnoRr57HfLUalg2RQI6EtjLmy7td6Sf84mZunYESDYuoLqZfw31nJXx76sHqa0MuWiNFIJZ4MGOj44GZ4M3HAWniv48KeVFrq9nncw1bC0TKrBvxRNEFr7PUDGE9JlqLA+qafZzAftuMu51hjSuF9v/fmM9706KcsyFLw09ZacTXdAtTYU9DCIG3pozdIKAjTL7mIHvZ0eUK5/+2NQ/Xuf9wgtZiBSBIUlFgDGPMNZGDb7F3B2/BLOViIdBHTlF2BZG2i7Xf84m2TN/c2tlDkKNwtFr7iQEnZhQqdVCkVynwfxJ6l3qXarkymITEzuibzdLC2p1SCS1MfSjfD7noexmrGY22pgIVn0R7uS8AhpNvMgEFW3+qpNcoq05Zwix+Rq/frdXnDjsyuaVsYLW5zdYUU9+rWDDWsGhg5299km3Lyb3kwdGjq99Q0KDu2YAWNLB9taYtfhoAvTGhhEwkZgn8KSRsj0Q7yelvorN0DFmIch2p9OCq13YrhPC4JPqkYcl6Wgk4P1v5N9RxSw40NvkPYXbapG5iWowtPRBSXHHWKp6kKVbdaSSafsP93ZQoe82PYR5WU96Q0Q3g7I6cAC6ktDqIZm0UqGm78DlHx8AtQqiQOgIuV8fCFK2iYkmCqz35kg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?6DWLtb3OX+KjIWRpHcGKruCOi2Dx?= =?utf-8?q?mFD7dm7e6Kas7Jc72JJAwaZaHmWjdvlYzYpDyrR3M9kklTHTeO5NfrzXttUCuEzK/?= =?utf-8?q?ZwtnMk5kd66k1/GxixUMzNAK9PlAy7ijIP8E50wvBRIe5dRnoMEeha6AH2/J/3310?= =?utf-8?q?sTKBkhdtlUyoH3fFOCx+slQyFeBDoUZoJXWl0RuYDo4moapznP3B4oNfo0FSK6Y+s?= =?utf-8?q?whYoLTWxBe5yU5Ky80VumepEH6ERw9lBpbYUciPnS2m02LHIG4CA3tDvQ8krwmKzp?= =?utf-8?q?04ZJRlmNIpsw89ipJMMvHGgqYzH8vKtmIZfPVXpzcZsqQNr2Sr4LKG3dIngEigN23?= =?utf-8?q?0XDjRXDzUpiSHwQQOi96oiKZFyOkKkxcn7uz3NtVgAw7nrBsFGgJk7KPOLKZwOYDa?= =?utf-8?q?dud3qCussCUkXv1SwvGtEvRMx3K+YYwVPrUeNSiGcFxIaJOrgMZJODdf8QsF/8mGm?= =?utf-8?q?RkzmDneH15vGP/ZY2bOryv5I0PFRip0kMDT+wzj0VsEvIfm09Zzbl7Jv2zG7OCv+L?= =?utf-8?q?fcTa2r8beki3/lZlFusk1pM72c06nmisWD8iNz3bqzZyuD2Fkb3+jnxgiqWZL5Io6?= =?utf-8?q?NO+inzKKT1rCc4oJvFu4vVoRjw7dywzTO9dDbvKRWWpiQmHVauFr/s1OALoY479k/?= =?utf-8?q?78+e+mmkMcEYucEvXTKaNWm9/+N2IKvcqU+6VTt+4UbX0FeH917kpZem4lwcDaiPv?= =?utf-8?q?7/1V87185kfSXDI/ElBdniEvY4RqhD6Zt50z8ggPhPKQn+4AZIvgveSyBvpZRoGyg?= =?utf-8?q?t6MKiFVTVbhmMdIyu4RFaNXIhXwxr8v8T4XHTrKtvIyew30g3Yi/a5YJN88UkRkoD?= =?utf-8?q?lFNTfkRmj+4bAJJ+QpBDP87WSvPvEJO/imZBKrKDLuT/iGE5lh+LP1qMknArffUUs?= =?utf-8?q?nswbrDcQC4vqNA6EylFUBV5NoGvE+N6JzSbAI4wjz9z48I5XZcADcmm6+chjZgMob?= =?utf-8?q?JfVXua4xM0MzbRHE5jKNSKUKuZF8ks4dLGyz3zoMHWIwiISJ6rjxIF/mPkmIe1WGJ?= =?utf-8?q?X5lF6VOWU1qALbRHJ0RVlbvuhPV0oIVvo33WNYXYUngGzUhzwPE/jMsn3HM2oZRPH?= =?utf-8?q?E7nWE5xe1+rKNqFdgcb3+wJChiluMeb4AVPc7IrYRl51ySv/VDaToHEXFGrHUsrgN?= =?utf-8?q?VFWz24a3rX1hGCAcIt8WmRsFaY97Q9KaLpppFhDL1/2ZWrNYIIRIcmTXvtvQVXnpq?= =?utf-8?q?LNSpkFB7pT04cz/8Hb5CiWwUhF4GMauAheWUAaHVJ33zla5ZtXITzaaUhI1Q=3D?= X-OriginatorOrg: sct-15-20-4778-2-msonline-outlook-1105a.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 8c89fa98-e72c-4a15-8e4b-08da9b5ef847 X-MS-Exchange-CrossTenant-AuthSource: DB6PR07MB3175.eurprd07.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2022 23:22:22.5547 (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: VI1PR0701MB6829 Subject: [FFmpeg-devel] [PATCH] libavformat/fitsdec: use correct type for assert 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: yYB5j5m8ymJw Since avbuf.len is of type unsigned and not int64_t, compare to UINT_MAX instead of INT64_MAX. This fixes the following warning on clang: src/libavformat/fitsdec.c:177:26: warning: result of comparison of constant 9223372036854775807 with expression of type 'unsigned int' is always true [-Wtautological-constant-out-of-range-compare] av_assert0(avbuf.len <= INT64_MAX && size <= INT64_MAX); ~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- libavformat/fitsdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/fitsdec.c b/libavformat/fitsdec.c index 54412c60ff..b2ef826f52 100644 --- a/libavformat/fitsdec.c +++ b/libavformat/fitsdec.c @@ -174,7 +174,7 @@ static int fits_read_packet(AVFormatContext *s, AVPacket *pkt) goto fail; } - av_assert0(avbuf.len <= INT64_MAX && size <= INT64_MAX); + av_assert0(avbuf.len <= UINT_MAX && size <= INT64_MAX); if (avbuf.len + size > INT_MAX - 80) { ret = AVERROR_INVALIDDATA; goto fail;