From patchwork Mon Sep 11 16:29:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43700 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e27:b0:149:dfde:5c0a with SMTP id gk39csp2249020pzb; Mon, 11 Sep 2023 09:29:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHNa6TimtBkDQjef5cYmEFhcr9JkC6q9t7P1pt6qfUiT5Z72Sc03IMZnNieolCvm0GkaZRP X-Received: by 2002:a05:6402:2d9:b0:525:691c:cd50 with SMTP id b25-20020a05640202d900b00525691ccd50mr9371565edx.24.1694449740001; Mon, 11 Sep 2023 09:29:00 -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 u25-20020aa7d0d9000000b00523409dcaabsi7178152edo.617.2023.09.11.09.28.59; Mon, 11 Sep 2023 09:28:59 -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=@outlook.com header.s=selector1 header.b="q/HSDxnv"; 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 2C79D68C94B; Mon, 11 Sep 2023 19:28:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2069.outbound.protection.outlook.com [40.92.73.69]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AE7BB68C7D7 for ; Mon, 11 Sep 2023 19:28:49 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Yf9Zq1HzXaVEku9wwLrzrEIcB0IJNRwfZ5xmPVQmjOtS4cLpoAF4/Lzx8bbzJKXevfA97yPWm+AgljSNAoLKJxJ+9mMOyIxPO552fC462wLN6vZbBjUUnydkORc/S5ij2EUMXcnjem856ezlrObJUNNxg90s9P5ExUAZmZFaKFUp3+6iGXI8jPVTmTyxQxb+dkTeGD2dNYQE/gmZ4gdk/d9+duQGlJSirFDTYkBDNv8Pajq9nw37ekjZYaW9qzwtQ0/oBksBEn3U19M+pd9Jx8mRnlyWqs/4UyrDS9wFK63q60Pkmg6VS6Kjk5MLMN4ZDLzDt9jLwRw81w5HrtWxHA== 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=3Nx+qKdHD7j7sOv2PUxntXfooLG+NJIqXbL6MIbDWvQ=; b=XGWxbd6ozVKp0ImMVAslZPRhuGDU9AEmNMQ+tgbyjBRskYVCOYMgZ7tL1oAj9LIsJ4/A/ItP0mtTHEknwT7N1ZHZInmwrVZhARvV1Sk9YwoeR77JRdMY/+il/SPnvq4mhv7luUfDPIwJLNGy9R6OvHCqHQ3Pl93sFL8U/8/MKdeNGJc2QIi+EKgPrBt6Hz8JLrIJq+fm7o/6T6EjbQBhB2M+Q3bkezD5ahWNt3+2RStDKAo/sQFsrlM6QMolbYwDpVHIjTWCZ+QsJ6TNi56SQ4WC35jcDcjijx1800LSOXdWNCmG+8QJt3MZOYC7TjBI6ofGlCEbPPJyIPYoFA1mig== 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=3Nx+qKdHD7j7sOv2PUxntXfooLG+NJIqXbL6MIbDWvQ=; b=q/HSDxnvk+fIvjqE2gNz6txgR3NFKaqEGsYUkAM+xi74YQsFWqiPHbjFSgQhzqW6pchSlqaBvhe4Bz8B2a7w1Aja3ouqI0Y9YvMb651438JvV4MG5H4N8e13Twzck+2D/WGdtW7o/o9KfyUFJJBCUZqCpbMis57r90WacuyxtU5peoqv4kjp2wnWbPBqcg7UDgynGSpaIb9ebpGacfPxsM+yi+oZfMcCb5CloeeTYIOAPUQQpkQFe6KTAa2o8P3anNhKC+i9IdonW6nljDCsJ6Zpl3YEZwqZ6hBhhApcj3qzOf4lNc/ToWPOtiA8O2ky4tNgr4gI2glxKVMSjqJc7A== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0250.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37d::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.34; Mon, 11 Sep 2023 16:28:47 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6768.029; Mon, 11 Sep 2023 16:28:47 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Sep 2023 18:29:59 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [ugXo6wJ+7awyAMsuddONVI/in31Q2bMg] X-ClientProxiedBy: AM0PR10CA0127.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:e6::44) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230911162959.297854-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0250:EE_ X-MS-Office365-Filtering-Correlation-Id: 6967b1ae-8962-4f70-7c6a-08dbb2e42cb2 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: F7gYHspOzemqWBFecNZFOxAn/i3Qz54f+8bvspoIJAYBdwlxHxvi728eHT79q2s9VgqPWnpldC+voduak1RrKBMyTRt1qbA2Kx1qA/VnOtUVKpxNMGPkQlaecP1WeI+2MzNYH9XJbMpqGUYo6sLYUY7KoVCbBW0r4XjmCnBj8lIxMffnkAHPFroxP6EtjpfVx3kikDp2SLDNKCvU2RfOGcfDrgLKwb9MltivtSKOaeWiKusKGGGI5n3yGEsmWP1zuzwkmenBpJUe0F7E3b1Z/YWb9ujO1QdA448aIj6duOxGmSrU+OFobANtXKaIDso2Rv86z7LEbloYr3YYbOHv3pbdtwbXRUxg3CaVl1ZKLpQ3wIxQ3w0I84uURlzyqNKxUzk6+ejm7Lnr2g/xpQ+o+j0zPI8rNTl+hbBhW+stHeoCr60wRRPwfvyvrxKdMRAPkZwjLohmtEILhCeo7hVVAHQE4yPmjrri07i3kQ9tm5lVVW9s18SiuCYWL/+KxwVVjUTYUxTFDJD7HXJboSL0qENvZbttUJXeil1OPFw/L8d75W4+K46Fr7kGrc0ObXOAs3tQVVuSeD9Jg+uQzJjVxaUnTOAxVFqSegWVzNy3+X+sZy+riSOTEQaTLDoULQ/5 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BmUEmFuzqhiqho6kNnFHT/AgIVkanZAV1OJZJbz7OWDtLhQ/C+dsGJ9pow+SQ3rKQBf8pTvubuVot+p8gRfuOwwsqDwcFWCfqEFXD1/3KuxxzCS7Y1IEbVpKGRa9CrFWhvhybFhI6ufcCM6rfzg74r0hSl1V7ACCMoyxgbpPlRgaFpxH8MpoDuyVu3KBp4baYwQcP6dR0S7jhKTHCx2ZNj9x2TFyW/k2+5JSOXLvKeDQeRyB5R7Q2Aqvg57wieR7WoP9kcGYHe5eidvT8/jD7/6TIFeK8lWCgnZm6cSHsJR8mYokdWafkQYcJ38K5HsB2Hij0cAOPN/DJ0HhXBmE98lADRESJp1Jjl/psYZ/Iz3qbL3ULRcBiuuZ0aQtEcJ8ZEYEEvxnVPxsxYQ0m0SdiPtHIUeQRbhr16NzBKOnt8iMaLjIX92tmRn+0Gn1fHnUl8v/u9PLykv+vqUnNNRDBXbmsWYjxT79B69ndCOVwyMgQCEKc6lxNg+KT1ZKojf2nXnGQ0KJxEYaW8T8lcW3PLgUhJgcxwXyPOu7AtZ0JbkWA4L9noVEdaSlm5JYyVbdl7iCpY0P4bpP/cfxi+tayTaXNj6YrJ83TWqNLqdjHAiWJFDvnrj8xmutF+2OmW9gphuQwvsCEpbNH/z6CdfNLR6clqgOq2Q8hm0/gMQAbXkU/BdEmkG2kk/FsHL+FM5CSTsvSQR75oyYEz95/iLwSWjttC8HRFsHW/ZLfeEZ5rOuPyEuwIvKeuM82tQlNLKYe57TAaqUcv20HkhA7GYRjRdZnCW0JVsEBGY6VxxRghSpoaTd+YKu5Mm3IIs5lK2f3EVts1KDznNQpd8Tw4ZmrsfsslscBFPmf3cA2bSIwd97/uv/4uTWY3EzaXx+fSVLsETbg+9JSHEfBhOG4SsZr1vVfuXtouIZF7fxDVT0KKkgWNtHQPQsyyOkCGfzIh0ED9/vbjv8gMYrmfSD5LevlAHKQLLsKWWwyBK7e+WwlyVotZP0pwKwjn7/V8k5IrInwi5xIxoDp6cV33xp3ta6Fz7IPT9bnuwDL8SPA34Tff2dPFEiBaHCf2gwsSONqXpep3YPSwKAjW8Y0saBxfmfuvNqgWRDSt1rPCOuojy/DPKVPagNqv1/Du8o5osp4aS/1VSLdkbdOrDTSQcHmpt5bZfbwmOASAcffoWvHkLYtpChq2P+AlK/0eoI12/uO/aBXqdeMu1whUiv4b07Pw7oTi86FFwxwdp1/xekj6w7vdefbLEYdWynnJthyATRZy5G X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6967b1ae-8962-4f70-7c6a-08dbb2e42cb2 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 16:28:47.7803 (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: AS8P250MB0250 Subject: [FFmpeg-devel] [PATCH] avformat/mxfdec: Don't pretend array to be bigger than it is 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: meHth4r3yYyf mxf_match_uid() accepts two const UID and a len parameter. UID is a typedef for an array of 16 uint8_t, so the const UID parameter is actually a pointer to const uint8_t. The point of mxf_match_uid() is to check whether the initial part of two UIDs match; the length of said part is given by the len parameter. Once an incomplete UID has been passed to mxf_match_uid() (albeit with the correct len, so safe), which makes GCC emit -Wstringop-overread warnings. Fix this by using a const uint8_t[] as type; it is more natural for incomplete UIDs. Signed-off-by: Andreas Rheinhardt --- libavformat/mxfdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 7dbe294d23..4846c5d206 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -1544,11 +1544,11 @@ static int mxf_read_tagged_value(void *arg, AVIOContext *pb, int tag, int size, * Match an uid independently of the version byte and up to len common bytes * Returns: boolean */ -static int mxf_match_uid(const UID key, const UID uid, int len) +static int mxf_match_uid(const UID key, const uint8_t uid_prefix[], int len) { int i; for (i = 0; i < len; i++) { - if (i != 7 && key[i] != uid[i]) + if (i != 7 && key[i] != uid_prefix[i]) return 0; } return 1;