From patchwork Tue Mar 15 15:01:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34760 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp3089736nkb; Tue, 15 Mar 2022 08:01:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxQQX4TZBORfm+ci/jQfsiJg9LO7xrMichuvdkpICmMtRm4WbB/x4R59V7DHHVD0pnS8OI0 X-Received: by 2002:a17:907:76f7:b0:6d6:e922:3cd with SMTP id kg23-20020a17090776f700b006d6e92203cdmr24408388ejc.386.1647356491651; Tue, 15 Mar 2022 08:01:31 -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 o15-20020a509b0f000000b00415d59918cesi15978084edi.81.2022.03.15.08.01.31; Tue, 15 Mar 2022 08:01:31 -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=pJQQwsNA; 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 995DE68A115; Tue, 15 Mar 2022 17:01:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067017.outbound.protection.outlook.com [40.92.67.17]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3E25A6804B9 for ; Tue, 15 Mar 2022 17:01:21 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ne/23YODf2GFKUm9/xwvki4p3mTQeN4TqOzjcV+tGcleneXqPvsk7Zed5FDVt0zRPYreNWH/O+IbPxbB81YGIjV3eDzOemp99hs5N7NZWwsc8vnxiDvhIFT0gF0e2CfzyIvSavw4ZjBVj9xWz6Sn6rSPM7pB8zHOpix5nOuZY3dqWqTb6BZmFDN6Us9xBGo4mfSTMsvgTNt0O9eRwGzb/37zF/+5g/yoR/4H/gV1OK6Z7KrgipEIs4gbv1cNHWiZW1rbbN6UqMmLv03nQJ3IF9vdlD9VbGYI/9YX85NCaTcYGNsX2Wf8D5iIjEQaL0/Dr7VePORi/cPJz0xyX8Ua4Q== 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=WuH/vfSIyH88y0oByU+lof+JVl/1cCyqgSI/UtPLnO8=; b=aOUUwEK/NvXgmyWQZBIgrEqIPfOESxIdlI7EUr+OGYUrNU9u8iUIV6kvv5rNmOz+XjeDCv6eP0CeiObUoZBV3oWLBoY+tQO/SOhZKF/qbmkhxOd1aQsj+rGi/9MR3qfdo6Y/zYaiwVwQEn6vcVpIUSOupM/S/IfEnOVmuPEHzGXayq0+J9edZnHP1nteH9og50NgEJ2CHPjneX5O+woIpMuWQZbTytDSTbuGJ58pPckFESVNHtT7/2ScRQtajnDBNirHxK4JH87HVutCrpVTHeiUJq1rEjmx4j1zIy/8bKCL7krNe4kuqA4Kpj0ZgcG+EAOxElv7RRAiSymlwLuMQg== 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=WuH/vfSIyH88y0oByU+lof+JVl/1cCyqgSI/UtPLnO8=; b=pJQQwsNA45G4PUJJE9954mYjVFreTCs0PTr4VAOG+ygLO5FFkmTuqmxaZBrUyQO7aEquT9/mcB7xwS1tnb1FPV307Qyjn8aqidLd7WHYUD2wrOCbXDeGt7HdRTjUMuB/fNJADYhlhdvV8TEkmL7JvfRcBgcYSXWQoa92wo5DCSPZ75WX2px+bXkaF/tS57gtiIay4V3KQoi+luwnBozhLYpiGZI3dsJl454EWPcDSlBBsLuG8YAXfl1dq/Wp1yLOwAcTYUtKkkfs8Uz4Y6hwsJdbpOaag+CYn+RghT29yg13dXpIZa/DEr3qRubeOyh4SbgMSIFnMJUGNVcXEZhzZA== Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) by AM8PR01MB7620.eurprd01.prod.exchangelabs.com (2603:10a6:20b:244::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.14; Tue, 15 Mar 2022 15:01:19 +0000 Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com ([fe80::9070:a5fd:e532:bdf8]) by AS1PR01MB9564.eurprd01.prod.exchangelabs.com ([fe80::9070:a5fd:e532:bdf8%4]) with mapi id 15.20.5061.028; Tue, 15 Mar 2022 15:01:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Mar 2022 16:01:11 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [5K390C9jT9SWHr2e3m4wiqo9SpkPwA2D] X-ClientProxiedBy: AM6P192CA0091.EURP192.PROD.OUTLOOK.COM (2603:10a6:209:8d::32) To AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) X-Microsoft-Original-Message-ID: <20220315150111.220950-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 71420c24-9bac-444e-6c31-08da0694a98a X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQIK6GOv6I/55wbGPSyl+b6aTqa9dAe057aG8af2AtKYDnuOrAuWLI1gkxwqcl2MKL5aVfiEYpfFRNQMXrcrFKE58b51W9k7LV98me0eGWj6NqTgUpbNXKRGhtOjJa456yPBDHg7sYjKHNfVJuzWLtiY7K+6jROHQyAIPAFI/VATufdTFbN3t10oiMOuqCwbkvh1gm5VPEAKVa71NvoqWt+NqR0JCgGHySQi2UIbxaWQXNjk0zPoGM9iV4zvReNb9rU5ZTfx2XC+zPbZB/NoVvUpmbi4I5ELPfvJfQAJhdFcsSGljyGlq3vKt6Fch4gSl/+R4/6S3tT+aATlEMRaHBrNRQD6K+kDsK5P832KvwnBzYHpfY56eBsrTj/V1b15GyOun8afYXdpvdSMXAb2u0HH89jiai1fokPJc2KTvnJVWlvhillgTAJyqjchyib29P8iLdWc3xjrG3YarZSqvRkpIyYNHASMVpushluoec7ngHfa53H96zyFaw07Vy2nf5LBVgfNVS6OYZXuVdo1DxFpMsaVhqSIhCckor+tcPnnZxK4cjeqSLi+QKgV5+0/5SZHQuTLD4Bi9Efyvw3SMPABvkk4BRKZ0Ouu4TjO2gdi/3P7J6O5oMrR+6crqdhOLyIo5CVvmaU+Uy19sS6WBvw6xW/8DG9FqG0CPCH+/gWEuCs5VROhVx8o+fBttCrWPGb10hQW+mhjRS14+gWuxfilhAwgHKXUsHgfngNIDvzKh3xP1LaTpC6bsh3u9KhVgE= X-MS-TrafficTypeDiagnostic: AM8PR01MB7620:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WcJAG4Jrjtxwwwu+YCpxRrbgGpnAoNg3YaLfTgityJQMZx5r9nDIcc33uAX3SwFoQ0WmE265bvSSOiNFGoCFeTdk4vN0ZAIIloV8w2Cn5evPt5Tg/bdZOC465H3fWkaE6AtMyCIYIuX2lSw64A0hrAJ9fwbUTaokXXcRUm6e5kVUsuEL7TvDHxmQLkdOZvwCZ8VWiZjptZyklh6wJk/J2/jVdYNn7KB0MK2qYYOFYqatUUL37ME9kRTdyx0brtGyMVKayT14tZlWCvEEKkvAcZYcSTY9MhSWeXHY2a8nMkSiiIXsZ31nXEuT8b4IsJsIsEsaqnTSKbSfFpc8w8iK+CqJrUdwfRwFPkWi7pVCdGxFlUbxSH6Qp7XSvf9Gfqn17/rMjI+wZJ/LQIgaVfxpt9UFzAv7XEkztIz56MrjDZrFqtGUcalS42AM5CH+CO2oOpOjwHloAQQUithWwGj2I89cbDWcO0BcttbOXCPnzkObFdsfy0LJ/RyxmmO0dYLKyiaNBHVDDg5tUddXYt13KI3OO6/eufJWVkX3bFlUllJlK+odRmJEVJMl8KWYbjN0YBGA5qIR23XE0ce4NSAO/A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xPGgstYPuKzr+QUtV+yK89rbvB0aPMeiSZkNxQvWNTkjISFxH5kJBo6SjpM/HXu7zvx8gEYjBivrWKGOSiaJvIxgNZrgDmhFHH8EGrSb6u6qI2hKkXwPpddVeHe33FgTJGnXIo/SR9QHWlesCTPE4SbtjpB1ROH5oWhKkLM/7uMiOz4welI1hvqdeyWRcYkfUQNAgcwEAR0Ecm914d86fMQmVRC0avryf7HhlVqwUGedxUMV0wjmmNYbIxm+bpD5my2N6ja2fjVKWvCiR3oHgfkdLKQf6AuxzdWNn0l5DbX1Qmj0ZhJ+Tpx8wmiyWJGNziepd3RwDun3BdrGxZJyVkkk/UbK8+agVO/dEYgzk3ticn1j76Wn4nW5Ajclk1EaEAalDTpfHBgSYqbAaIEt6jMGz8LIXu3d5Mrkwb8dDU7ltL/9EGWVgkCnrj1OWYHse+lUMaO2w4WWkNMDvImpOoHn1HvB+SeSLnbPPTv6ssM+41RgQBBgcVBC757PBYa5FMJQnA3h0RThQnLCQtNRCTfZoW1JSkcUm0bQ9298v/oGoKa2S7fc/3Oh75Iqbs/Dozl5bJ89kvSNt2IQU2bhqheyjmbBCOfg0FF5zn+adQMP8BApZ9W2eofPm4Jq6MyXygj6UuaapHbIbR0M4XxWRmCyRUe3mxKS9nh87wRls2sUBkhEGvZmAfm8BYx+BcrAYd1MzbC5RWfionFNMu1jBDt9T1ULinpsI0gCG7gSiy+wis0h2iOMnSLTRRJQwteq3hDM+OhHB4ynyw9e1WHDwh0tAHYsvZR58oI4Bnmh84E7Nf1NkOYTjB7y+NPhD44U/WYkOOIdCvAG6XMopq+2buPdSnCnCeUzZ8h4+mRVrSvegUgJrmkcVhirM/K/om+i4B+dKR+RJ/EP27caBNQncV8B3ldd6Rlh8iZ9znsJUblcXO0ch3j+eT4OkGex3en222obv/V9QRYhiP1jrdneWyBVlOWBZH7y2+sPQS0lImyDFDAYis2Lohb67640JON/MX/XTSSrMRJAyBWQtDnDRi1d3tOtHYyPtXjhHEvaUeU4JVkm2mdfknQpRTwuJzq5d2HsQvuMC0o/r90UxaVyl1pMGcDKIDHlbsndKOPEzTMg9fKnPlP4CSWBuSoY9YgMvm8caqFlaaLRV0afOGwSn5DkYa4OegS4NFQQcIKkVhaiLSm1xec3mMkVlBQ8vApN X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 71420c24-9bac-444e-6c31-08da0694a98a X-MS-Exchange-CrossTenant-AuthSource: AS1PR01MB9564.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Mar 2022 15:01:19.7880 (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: AM8PR01MB7620 Subject: [FFmpeg-devel] [PATCH] avfilter/af_join: Don't use memcpy for overlapping regions 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: a2r8FvVz1sLK Reported by ASAN as memcpy-param-overlap when running the filter-join FATE-test. Signed-off-by: Andreas Rheinhardt --- libavfilter/af_join.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c index 3e272d9161..6f01c6f70a 100644 --- a/libavfilter/af_join.c +++ b/libavfilter/af_join.c @@ -252,8 +252,8 @@ typedef struct ChannelList { static enum AVChannel channel_list_pop(ChannelList *chl, int idx) { enum AVChannel ret = chl->ch[idx]; - memcpy(chl->ch + idx, chl->ch + idx + 1, - (chl->nb_ch - idx - 1) * sizeof(*chl->ch)); + memmove(chl->ch + idx, chl->ch + idx + 1, + (chl->nb_ch - idx - 1) * sizeof(*chl->ch)); chl->nb_ch--; return ret; }