From patchwork Mon Jul 11 03:05:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36730 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:6da0:b0:8b:e47:9dbf with SMTP id wl32csp1110398pzb; Sun, 10 Jul 2022 20:06:04 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tSP0Oc4uPZXDYJ8Gsq9wlZ4nPA79boZK9LfYbppr7I6NXCI8eU4HBBIb502nKwMdDQ86kK X-Received: by 2002:a05:6402:3593:b0:43a:a259:2518 with SMTP id y19-20020a056402359300b0043aa2592518mr21905887edc.117.1657508763983; Sun, 10 Jul 2022 20:06:03 -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 q21-20020a170906b29500b00722efd22affsi7908078ejz.751.2022.07.10.20.06.03; Sun, 10 Jul 2022 20:06:03 -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="A0/+xFWi"; 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 E2CC068B74D; Mon, 11 Jul 2022 06:05:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-oln040092072046.outbound.protection.outlook.com [40.92.72.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7690068B657 for ; Mon, 11 Jul 2022 06:05:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LrNnd46RoAud+H0BKwo6rnmNKiN6aKUUE16Sf8HRHKLsJUP5aCkCgBzInq/HdXk2TptsHpMbIsaDM+97Ul2xL4MljmELFN6yR525NdovvaG3dsuZ3+PnVQy6jCS4BSEhakeK1o3Sv6EdYZ+qJo3+bkaaKhNcy7eJatfOPT0QVkXlB6jgsFXBHiPZZnzMaNwxsm5bvSXaQyKsd95PROEgHQUTLYrjejeCiZgfOGaj5QoTux6mmknGP04YwWMUzOww5gVgDObkZ2nGYK/aDVvETcmwDcfOoMKpRoOBpIKvUtDgwOsmhRyUGZTRNCd+G32u9On3fE+pvh/U40tbYho6pQ== 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=ISXnnCf6S5K0DTO4S+WNyMXmA9L3FUqMtPV1HqOHxgU=; b=dLM+TpL+TvjVn20K6yiYJOTRyGyaac21/Eo5VrzJc9Ems93lDMp+GwdLYJ7D+g442Rnu26o9D5jBd6lpLdHspnrBnODfImqQWH7giD6Ue9s95PykoVuWCfAuEFm/N2nKV8XYOJXPaLlh6EZXOitkj4OMo2IQhI0aiIe5GkKQEtLRTql34G29ap0wEy51GnsxjNTubOSvKgPqq8ehGQ8xAYD6DK1DoSywbuoWhw0QAN0OqVMZxayVyOSa/rRUAf6bJeLFndcaBHjh4AsWTmCX3Ac0Hk+166FBhOY80KVJD/5EN1IaNBEJSGy3c3zkX9K+RaBQx4MsaRd239pO6onn7Q== 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=ISXnnCf6S5K0DTO4S+WNyMXmA9L3FUqMtPV1HqOHxgU=; b=A0/+xFWiP8hL9sjGk7MROJJVBo6WBGJpG0YFfU0VaBLF+/5GYeEGB6haBSgC7T11C5zHZycgUmEvEpRm638dODKP5MSXxHXO7Ef/C48NJig/1DEL+xmnYr80UnKr4DtLAHdkgcq2lblyXxqxDXX3HimO9rdaqVJYbTkm/TpL7nTCf39K+c5/aSfcABhb0NWbcI4xGpCEGfLG9WIWzKamvkF6oJfpItOssrP2nVaEd6fF590AMRfeTzRIpaPd6lS0L42VqB6Gcvm22Kj6O4e56oma4p+eaVaqrSpPA7dw7MHx7F0MtSqv/C++wo8smw8XEmln0BB0We2htdywybQwbg== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AM5PR0101MB2467.eurprd01.prod.exchangelabs.com (2603:10a6:203:39::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.15; Mon, 11 Jul 2022 03:05:46 +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:05:46 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Jul 2022 05:05:37 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [4xoRjAw/WAyBH2FmIzCLEm58hskwG0u8] X-ClientProxiedBy: AM5PR1001CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:206:15::16) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220711030538.3306478-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4ba4be7b-91aa-4593-bf6f-08da62ea401a X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVlwZi2WejqAf3Basax/LEuB29Sqh7Vbhw2YELGvV8KYc+ZQrGcNtnYwopEXH4NvqTAYe6UHToke0bnnXS9K6A6DJjZSdbsmIeRM/BtHtaW9NG9EUzDYNkMIuC9NAjKRrXr9zhYkGFK+Gji5XdvZIJh9QT4MN0VBzWEyRoGkaXHH4/KKh6lNq5WnGf8wxlA5i1wEsSkbrJGyswAzkGxxyGxuuoyCSpSaoULNxgYdLFrEI0JZfK15qCfDsgYfqOO1bzPPyQIa5hCIGz7FgbjHAYFqoK1MsCHrivB3vSaVS7j1Xi9BfjJjzgB9eaB017Z59U3VQ1Ubh3f+q5GyjJL0aZ3nCQmVaEfOUfZsKMrcT+XS4zZLnbd98aGrkS4W/fGXyoOfxFE0uP2PCQ+nk2sZAGRBDqOaiUAkI/2rZjFCYsj/pIYmh5EHzHUcVoHPVBcOvUdW/Q0mJz6Y6Sk+NX7BHesilmdjXKCBXSNu5mQ8GjKyZCrjTWNBbkftsC9uOmQkJktO6xDCScHcruD4i6wN8fur6ZSqvR8OE4gU7b9N05SiFUEEuqfSpSJpS/gPRHn8cqtj7P/fyZKyvpumauhjxKYIcryKc3VwRIp+ixi5JFWh0Fero0cg9thSuh/qPdhp2IzlPQBlPLwgasPEcofx0zzWsF4iZ6i5uVutuJa/ag/NcP1knJVq6SVs28c3db/BT7l1+A1TLME9fR41MiX7+m3xi1L8evtba0= X-MS-TrafficTypeDiagnostic: AM5PR0101MB2467:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QqzqJBzHWF2pXvmcRvH9PMjmILfob/r2ondhqSqSVuyvHXTIwi8P0LKEfbd8oHh9e1XkCrw4t0rL7sJg/RgdtBOmoReQnVkA4vzClHl0WigwGoa9okM+isUkOlpZO8LybvqkM6mAWfXYh1XKqMT6mWypWc1A7i8UQypoIaBd/RNOl/vlnUtuhNm113Q6S1Xu4aCgexovizuRLiJVTLxj9vv4SnArkPf0w8AGbW/ZfyIJ6FOKzX7uiYcmEznhFpXENLo0RI0FfNFV6zBWhiH0hp9MiYCzBO3HN3L2ZBfLadD4VTUko1NaHdSFbYBD/1c6wNlQG9ISa3OsGG02Z6LHVWSDLpHSqO7EH2T1+FYbAsCVaNe5ecLJ/6dzaWkp9SosngMTTQ3jGveSdBOQZgfC37yBMpYZ4ZdQN07SCnUur07tCoJE3HJQAMZ/n5I1a6UuLuuAO5lhb3qTNd8xkUGZ93Y9kFfvnYmyaf6CWvb9BUk0b+rbyqP+nbwCV2ML/XnIvjO72AuARm0Y0eGo61PwlETw+Zrz3MXf9asHwYzuTdJwJrWHRXqXskVtRwJVGEHm+/Dlm1ymhidKsWw1B6lRu52C7yuNpPf7jCafPJmZFPcT9aqXAm2q9NaQntcx1kngTgEkfa2UdL2ysnBzG0HBvTGduptruCsr1A8SUjH9zq9ll5bEIxn0B9ml0U5y1RPzozQRFLL4SWm8471rA0POQQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gWipcR3CHH4XdPWpwlxfiODSOeSEpEACUyVtHarig6na8MIx3qb8baSZAYOpKxWmFFu3RivBE7aYnkBSWJKgZUBrsF+07pNX1oKPFY4MKTTHKWJkRzffE/C8V6zh+OqGI61/nJOmrtjw60qBU+59GpOR9lUxhEqoywJ/NNlYTLt0687D0rfLEeBTk4nyhQR+uWdr04ydEhW2b0mjvo901QYuCg8M26WDOp1tSSCym/DEXKSzNbey1DxOOhxaGxHMhfCqWRcACyLGhVREbeVEA5KxxWAKj55DRPF83VtMs+sA7llY5AqhHG226YkjeL6+EuUevTzb2WOlsVDV0g7KyQ7qm604SveZE1kbQtI67rAfwfBjd364RpXGgbFT3pjh5GcKuOFYRgJ84KepRKlzzq+y8PxXF63+rNrWVyQpzbvIFzRwOhU1VlZmiiDOhnrKIkMpqdXNhARkd0rfNXwEKVH9PYjWridstsG2TwgmJ1QOcFh58e1qnpuVRrhYIEJy7iZV/WhA3ds66MrmIW0S6qsNGIS/A70Me+ZbLT8/qjXJgjXunce/aYK1IiNYfEJ42Oj8uWg7chcw0CNUP5lAUpaQh+bQuKgz9m8hblGXXnapadN16OM/v2NHzA55tzYwUnAL7W9g+65tZSxjrN4cY82qyc1lUrBHvCykAwzFZWvWCgGgkrNoMbbBsYhVjITX/pB2p6L8l7ejjyqNnCTQflahtib73ztiXwOvosZAzs8B0J+LaOUwBV2Eprtyu/syKQoz+E2QUsQfwGTAnmTRrO/saOPG6SHG0feRjAdETwxkdlEjd5HAUNtXVKX75M3QmN+K7kjVMk+Rg1yRRlUpFOru5/Ob3cQinaZ4y/QbzRQl0EjltV+jwcyAjykqjzRoD4gi4dM8Z/kIUXJ1hs3cs1o6vB65nlGH5UaebPl2ALLCK+RoT1u2zTradC2PSOzP7OWezmz90878g0VNnd5gwOApSBtZTOu1nD9dgjr7UQ9CwYh7YVk0Ep2JM3GIl50ArvN6M0Bs+2icer3j6+EwDrPfAfuBe5I+mJOYuj19j+QiM0WGzwGbP4aF13h1TzJhuxOCZgGMy0LGcNf59pR8Fm1HKW4TmEx4u/8La24iDi1gGIf2u0wmhxRjeOVDe4VRpKccQE5xzAi0eE3D+HViyOHXiOFl6f0iwp3r+BwnaWIXrAuiPP70fybdOB5nZ7o3hok7piqzv6OCdSUD0pshDYwlx+dh3z9KyhPt/JChqNevxJeihC0rkGXOvgQX2bMmzM5ykL/VoBQju3hUwVtYRN0M9mHDZ8mI6xUMjjm+708= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4ba4be7b-91aa-4593-bf6f-08da62ea401a 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:05:46.6366 (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: AM5PR0101MB2467 Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/h264_loopfilter: Fix incorrect function parameter array 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: +AkqRqUlES7W filter_mb_mbaff_edgev() and filter_mb_mbaff_edgecv() have a function parameter whose expected size depends upon another parameter: It is 2 * bsi + 1 (with bsi always being 1 or 2). This array is declared as const int16_t[7], yet some of the callers with bsi == 1 call it with only an const int16_t[4] available. This leads to -Wstringop-overread warnings from GCC 12.1. This commit fixes these by replacing [7] with [/* 2 * bsi + 1 */], so that the expected range and its dependence on bsi is immediately visible. Signed-off-by: Andreas Rheinhardt --- libavcodec/h264_loopfilter.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/h264_loopfilter.c b/libavcodec/h264_loopfilter.c index 2440cfa831..c164a289b7 100644 --- a/libavcodec/h264_loopfilter.c +++ b/libavcodec/h264_loopfilter.c @@ -143,7 +143,7 @@ static av_always_inline void filter_mb_edgecv(uint8_t *pix, int stride, static av_always_inline void filter_mb_mbaff_edgev(const H264Context *h, uint8_t *pix, int stride, - const int16_t bS[7], int bsi, + const int16_t bS[ /* 1 + 2 * bsi */ ], int bsi, int qp, int a, int b, int intra) { @@ -166,7 +166,7 @@ static av_always_inline void filter_mb_mbaff_edgev(const H264Context *h, uint8_t static av_always_inline void filter_mb_mbaff_edgecv(const H264Context *h, uint8_t *pix, int stride, - const int16_t bS[7], + const int16_t bS[ /* 1 + 2 * bsi */ ], int bsi, int qp, int a, int b, int intra) {