From patchwork Mon Jul 11 03:04:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36728 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:6da0:b0:8b:e47:9dbf with SMTP id wl32csp1109812pzb; Sun, 10 Jul 2022 20:04:33 -0700 (PDT) X-Google-Smtp-Source: AGRyM1u0o52RfZJf8d+HMVcK75S1/afEjr+z64XTQpyRkCCX+BJSnliM/oY52OZCOiT8ce/UZn27 X-Received: by 2002:a17:907:96a8:b0:72b:40b0:658 with SMTP id hd40-20020a17090796a800b0072b40b00658mr8571778ejc.3.1657508673309; Sun, 10 Jul 2022 20:04:33 -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 hs8-20020a1709073e8800b0072b3a86922bsi9528605ejc.455.2022.07.10.20.04.32; Sun, 10 Jul 2022 20:04:33 -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=TSZ6FROd; 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 C119968B586; Mon, 11 Jul 2022 06:04:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074077.outbound.protection.outlook.com [40.92.74.77]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1110868B586 for ; Mon, 11 Jul 2022 06:04:22 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MdWJX5mUa+FRcfM8Cf978I+nbfTZbOxhQmc0UrPiJjmHawoI8BQX23T84d+P3xWCOxcN2YBvsl0NCabUqeVeSuOnVnazujvfTWSnbRZzgSCNekUfdovHyoXhLT+FDGhOSWvawFRM55RApVLvWCF97FIDgOg+xI2p1INt0zIjBYCfyIEq1aNaLoZwxt1aO8aIeTBMIDR0BnMSVxUC+aci6WF2TssQlaJ1ZGrblhi5OnJ/ANBGcUZXRU5eSrD3CPaiH9KV11e+yJe5+O4M7foqNPUIGizipMEzoPWZ4n7IclB+2xDWA4NEEp4oV3DdKEp6ynnpGJt7xD+PvSmqzQsL6w== 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=sQJfrkogUJdty9q1N86P6q90HPBTQeDbPptyK3/zTGI=; b=LZeyvXt4eqPe58UF9wtL4UCB/UuXl/Dy6uEHUyxhf101qFoJgO5+C6ylqIVozo4S5hk0ls9OLtsSFYC8wH8wH3X/RDeX9v0sr/v9BTbFq6Q+gw94C/7DYdhaIFRCLB01l57QCAitWxdHTMLZ6dY60UJaMk7aFVL/dA7oDLpZFr/sAkeV57mBZRZqdmAhYOevQ03tPp+BOUWY0gRA8rz9S5e6LLFKaEnzbYymMdezkHak7u2hAwn0Ky8MloDXDC0tlNw2Nbtg0/klZw0B4u46DqGOryTtWwQK7RWRXzdRN3Il1eeaYXSWd2wUaB45vTvsCSn6SbdKVGUql3d5fl6F/Q== 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=sQJfrkogUJdty9q1N86P6q90HPBTQeDbPptyK3/zTGI=; b=TSZ6FROdkC+RWhFLdR8yc4Pk+WA4UB16viO/S7JKsP00YIBYrenr8W6fcHY5H1IkxUGoWgnUXDI/HJek2XEQ3zaHVVdaewmPANRFsW6nDGEW+saIUHcAnt7Mqmhpw25FLlmQMJcyjQkRuXKZuIw9yZMcwL4ehxGF8bC7mAV4v2PjpYskl4XrrLa99pzsBOiyQDLEQwT6uBUyiGLCptvO+61KR1o4saG/Pd9u/0MJhXTY2qJ9fsY0AFsZXIMRrxZ41HAOP6VayYNBEgkM7KcuQftYv/RGTtr0eK+yUeizGKoUvO+5R1ALDo2uep1RApopmUmxENTVPf1Gpfs0Glp5jA== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DB9PR01MB10170.eurprd01.prod.exchangelabs.com (2603:10a6:10:30e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.26; Mon, 11 Jul 2022 03:04:19 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5417.026; Mon, 11 Jul 2022 03:04:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Jul 2022 05:04:07 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [eFcyXmXcRB112Rrp1L/D48E7s8QEld3W] X-ClientProxiedBy: AM5PR0701CA0019.eurprd07.prod.outlook.com (2603:10a6:203:51::29) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220711030410.3306432-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 59a2da80-6938-4afa-0faf-08da62ea0b3f X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQpgUKb+VO8j8I+it/2i4oyTMymE8LAdUcUEsO1dTHI6uqLu0ZBaHjll2jPWEZt40hDan8PaxCQyze5gC0FX66KFBRt/XV6Dt3ve+QXXd/W43+MdeuQxr4/Ayvtg0nzcY/Q6ikAiriNLbrHkvvBfv+0AHhwpOxNyVkwv3Ly48zzGwACgyIjuK2L4lk119E2HdWb9OiVd+L/uSk4SY6Kuy1iCnFORShEFgNRgoklgLCkVc9hG4wukGEHZ/Gj6XGanBAxp8tgFZFrEaSnen/IIcPbZmyclVc9rsuEt0XM8tyz8GHJfElXTbVgbSdmyX9Zxg1QmPavHr65Q9NZswQEs6BXB+WsqCFfvjjooOq36US0mkqrExtTV5nsGH2EbJuEyEj+kc/2W9VG+PEfW8AWMxQ6PgK7IfrjJ+QwuJVMmwK7KIuqXMH0AtETBPbg27RMOaVUSMxqIefPZHlsm+bo8c1/2sDu53B0GIPTzXirP2rnf8WGilmQZPVdA4OWDRJK/qqR7YpwPZC3lDqwju6XqRGpqjENdH0vQmcZAbVLwOfhfhv8ezbn6h6vUD2QjgjKjgcrCOVdF9Ojt7nvmi9AjUyUYeMUli71h5mO7XBVeWcUjDjd4S0+oE2Bs8UaVjFR7hDS+jNLOWv+AesPugXky9rQsuYDuSElRoEWd1kdkNdGiEOhIVQGrQlTcjm5UkxrUGNw0JoQKoTtDaFHhnFSsl/q3c+eIEr4bRDdild8a9dCjg085oIBHI0CSRJXXJfrCms= X-MS-TrafficTypeDiagnostic: DB9PR01MB10170:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LcaX6ZpBPlI7VeRd6xU/SE7PXGTE7ow+3ouAe+bNSWDQFjMEShGTRvkTlp94DsYLaSkhy4F6wnBRHmoPeJ5nFe1/2ZY/SNRBzBjBTjyK3FlSAq6Y+rq97AL63b2/hwtu2MHLLBgNzn+zUawfc4CVaq0v8IwP4KjDviJuxlPt4jsbjISgeBX6oJtZxlhI3CwJkzXmrnUHdKVXdlpeKG0QBuw7mQbfT10eSQAzQXFlMmN8CtzaieVRmirBd0019qu/WoRnN6A6Pax19c1q7Wk0ZrW3MirI70pRvTJZdGVtSOkYlmAlKIBFsbDvYPi6v6eLv+SluuDVu2ytoWfi6tAcwQ38ZAOl1EuF5NTmMG1di+/cI5TO48oel3agcVI0AF5uO1BC1jVtvtn3E4LBjGPOlXFB7a/o9GK+/8dao4cilOF4Hl+xcegIIupI+Rxy+9aksPjDxIFRLN3hWR/xqt0/DH9P/Ybr6zcAAdBi5Yd6klLwXTx/1hB1R3fxaWXMsjW92qWU9sJup0zr2wsUj9kqxg+CrsZVwGkkN3Qd+Ur3thDR6jBXxRhs2gidsKDUi6ui6YPA5dfFn2fvlCS0XQd2NUqpF4p0y9Iyu+9WxgVOA/+PDtF2ZOfp4afrTJAvnnf97K4bKqMABQc+Nfin/VhK37YP/dMHtj/abXF6XxesS7863PJZHtUqSXnsLL2bFUESwYQJho6lTwzpRFZpWP9tqg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zoeCBdg9IBT000kkOi8qU+UL1t0ewfBBPSU+TijoccsXUu2aI0Usce95equ8joS6yftzgKTLwudPqmp+deeTHmXCX3X1AX1hR2yL0Be7Sg//UOwm52rHnoCEdVeOgmQdgmCpv+3xo8Rz+u64rvfq4oL4YYDkW2ljeuoX7gRlh4juW7MWtvnn4BW3XSljCmaaRTQclHVW5N73p/0yft+Z1PhkOiaqJLNtJ4Z1wVLEAX4ITaFLpbOE3zgYBgWJFiLrl2Vly60Z11kt/Dk0T1FG5rVjNWqaAOpsJwIAXoVezS4Nc0Qx5uCJc96eJap0G3l7xOVwM5FpQt+E9DgbVCdtbexoVe0OUjFSkxqLlbzBMCB89EgWPmC0NkIrIolEn4JW5I/T7wf3LXiIeEPOI7SvLtkWtO8VHGVLqUTfWa4QtVNlsUDUzHW9YzcV+xoYL+LhIHTtwNxqx5oIFhUU2xB239DF5AGibo8V86nXTpfdY+HKNocgq9k0S5vc64L40Ze8YRzoa5nL16eK6mC2/jyC632OCDGIn/9Q8CdC5CFB1jZGK9mpwQoJAIQTKJdzoK7jSGmSAKWT8mdv1JM72lvIMB4H7ILe5U/GfKl48LrenFIdxcnHnajMrJmYX48bCf7mbqwIpLpmwEqp8+RnMAgxkq8m2bJvucubxW/79jUVkdbn7D1mYcJQnnAmOteuEgbPs0fTPlQD/AU88zXlJpj6OA5a3vFRbwYHtXYKc1C8ODgBSsNf8NBB9ieE/+S5eaP6SAeQB9wPDHbZBvUkaFoT6siXAahclmfSJxPrullMG388dibkiOTw7HsKkuftNy/3Ij/zwHDk8L8IQFYeW+pEKe9x9WwgIzU0VSEChj4O05l2DUCf33mRBlKzYCAtx8viVA1y4XbEh74Vo/CU2eSZC5NYL7cvpGtTsDnbIG9b70jgfcs32EJhwruJbNTG9ctx3h7X3qW0q0I45fAKmkjuz7Ra/+V89euZGJ6jL0hQ6I+8XLvS7b298nFko1KVAUGo/0GC+skwfRWqH8IRqZVG/fcQlkr/VZHp3qB9jlZO568No5Pdyse1lK8n5URGf7qQLV3SP4zgOI8uXusSozNQQGkQVOhZ6VJ7OI+ljZhXsdQ0jxi9Ws9NU+ONYH3sRse57u+eTdaM5fQ33TVS4jTn4hWV2kZ5ADPbfjNWfXnZdAGYUqTTG/jpiInJZruUa4AIWYFvSFzAQ8XfbehRS/m2wK1bRr+2B3tIK6/1g+N3O0vhLxP4wGhvUjk7bOapXD6svp/cJqmz6d0c3DwkWokXX3+jIPAKPiF7MMD2ruEeFy8= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 59a2da80-6938-4afa-0faf-08da62ea0b3f X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2022 03:04:19.7521 (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: DB9PR01MB10170 Subject: [FFmpeg-devel] [PATCH 1/4] avformat/asfcrypt: Fix wrong array length in function declaration 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: jYJ5FmOlAJqt multiswap_step() and multiswap_inv_step() both only require six keys; in all current callers, these keys are part of an array of twelve keys, yet in some of these callers the keys given to these functions point to the second half of these twelve keys, so that only six keys are available to these functions. This led to -Wstringop-overread warnings when compiling with GCC 12.1. Fix these by adapting the declaration of these functions. Signed-off-by: Andreas Rheinhardt --- libavformat/asfcrypt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/asfcrypt.c b/libavformat/asfcrypt.c index c77e37503e..ed68fb60ed 100644 --- a/libavformat/asfcrypt.c +++ b/libavformat/asfcrypt.c @@ -73,7 +73,7 @@ static void multiswap_invert_keys(uint32_t keys[12]) keys[i] = inverse(keys[i]); } -static uint32_t multiswap_step(const uint32_t keys[12], uint32_t v) +static uint32_t multiswap_step(const uint32_t keys[6], uint32_t v) { int i; v *= keys[0]; @@ -85,7 +85,7 @@ static uint32_t multiswap_step(const uint32_t keys[12], uint32_t v) return v; } -static uint32_t multiswap_inv_step(const uint32_t keys[12], uint32_t v) +static uint32_t multiswap_inv_step(const uint32_t keys[6], uint32_t v) { int i; v -= keys[5];