From patchwork Tue Aug 10 23:43:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29407 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp899669iod; Tue, 10 Aug 2021 16:43:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw6ZtrW+JaC63Q3+apAB5JmfOIRdZwgTfC3FlFYOAcgNgfuYxjj/LhLWmHqxKx59QxbN9kY X-Received: by 2002:a05:6402:b56:: with SMTP id bx22mr7942155edb.285.1628639025988; Tue, 10 Aug 2021 16:43:45 -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 d19si11416788edp.134.2021.08.10.16.43.45; Tue, 10 Aug 2021 16:43:45 -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=powJP2+m; 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 AA28368A273; Wed, 11 Aug 2021 02:43:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2021.outbound.protection.outlook.com [40.92.90.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AA9406891F1 for ; Wed, 11 Aug 2021 02:43:36 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Qru82TX4Xcw/KKwyz8sLFUZcKbEBNlP4ZoM4NsQx59EY9F87OCQXlMIaIlCYTlbaF2KNenYK7hc/7jDJIBmFFl/Zpjf3C9vg4qpLo6UU5z1ayTyJIYeYQSH13U5q1ZANrXUQdoXMOAD0yd0UrQTYCGnjcjaE8+bMBoPlUUht13bFolVnaqaCNhw/T31mWIEbha2DUSoX4KmVSml7NdUkON6b/5tt3E8yhfkjF31ZfYlLtLT/AzGf0+W5u3wWR9kWjMvn6NuHkc4/OofHmzAddaiU+WX0FEgxRSOcI/sKUTMJIDKAz8KuuIiaMCmyNRPesXvv+Bu9UT8uGU4Ly0yqqA== 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-SenderADCheck; bh=0ip1Yd24HwFGZOW/3KNCkVWcUgvq/0YM3JFT296lxcU=; b=nMiSaJLbdWG46ZOuvpVFNYu69e6NRA97Yx1OvEqZNx8yxtl9dkH/9+NTppxQoz5lzfYyTKK/z2UMCZGeD4gLExBiP9/98oqWBFQltHr/FGeDkIxZq0sK2srcCu01ReW+3oHwcI/Z+/G4vI9nVarZRtnoaE8NzsRgyyaRI8FhEi8aYnQS98PzavXqF3J5JIXWy1LlonnObfwHQNis9I7yFAbOnF285QsWCeEro0LoDcoqaQkaJ/e+814G9oAZm6xlFLuGjTIWw5sGsm3WRJYKojzHr7s87T8Vnj6ojTki1ICixxMsva8BGvQNtNGN2wsV7J/Ej5XbNQz8r1HYfh1xPg== 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=0ip1Yd24HwFGZOW/3KNCkVWcUgvq/0YM3JFT296lxcU=; b=powJP2+mg4e/jo5arv0zVBpH1pbmZukHwCv/kOuHUPw1hwi9FDoDb2DRv7ckw+Mbw7z6TkfFT0N4I+fGeTejT/sE/PhVAnk7GC0HTjXm2ec9nOVUqwXBC6wVMava8teTD9OoToQ2l92WK/6+VXjVztaSgUKs0vsbhf88v9c0y6mbraB7U4ok2ROAQrO/vkVTn17i2uKI3vGxTIrXIxd+m7tXTX12FX+VxJ/hmBjX6s1yeAlMb9xtLWpfwrNhCGw9BcuL795qQEFpm93C6jStjVY9PzJ1azqbW1lfmoK497z8x+rzu9tNkxBRIQjJPkaOzNHe4N3tTIF8hbOBRRlVGQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5607.eurprd03.prod.outlook.com (2603:10a6:20b:fe::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.16; Tue, 10 Aug 2021 23:43:35 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ded:bace:bc7:e91d]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ded:bace:bc7:e91d%3]) with mapi id 15.20.4394.023; Tue, 10 Aug 2021 23:43:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 11 Aug 2021 01:43:25 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [P5YVAgyvfXO4t7XWvRGN60PsaNmDZM4h] X-ClientProxiedBy: AM0PR02CA0224.eurprd02.prod.outlook.com (2603:10a6:20b:28f::31) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210810234326.656637-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.95.102) by AM0PR02CA0224.eurprd02.prod.outlook.com (2603:10a6:20b:28f::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.17 via Frontend Transport; Tue, 10 Aug 2021 23:43:34 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: abc82ca6-e7b8-4b1f-5310-08d95c58ab27 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT4+P6zBac8z+9gXHAF6SHp1zRW4lmP+VEHvnAcadEHB/hYUMIb178FD0ncD4Vb/DJGCOzyu0irRguHAQORWT9aGX8rlKvjEaTuw2xjZCz1QRk0I3bSgL8LFNftJDDyXXreE/7V7oQG3PCFrBfrRswIq75nrw/Whr8U1RoyeS3z2MaiKVDeDfB2p9irsOAXgEh9fPUX60RVYtf6s6BMv4I7L+4+RZbpyGb5N85vrHIXrzsFvWHqvw3EVxwNSOP2x1UrSu/E2VPWZuAPasw8peWmCdhaXwHKGbCPIYXcCXNdm2ag9mS21ppdXoBs4TTa0C11ctuwzZ44j9Oaq0CjGsajk1tNMdTJtMClTkUl5K/PeFeaxC3wnDHSA25F8gB8kdKcCeqPweBytK+C2UUfnGOY/ClvNPr61kb/uwpQ6TNFghIIUCnuzHsISaB/K+06lZWgN5YWTht3G3x8E3pWHAkkdCjEK9t2c/ff2+Tfi1JVHnko/9cAptJLP3SqSXrWaVwtWFbqXHmk1z9vv6AsYx5Sk1uu0xoHZV3oOXh7uNx80NTq9/QsydPa3xmKjPseXMgFUZBreLW8afycPft9REym16EmWrHNuSQS8u6BuIEOmMBU2Z5uIhMgWQPIN95AkonCUqArd9hWIz5SH3+TJwWiz7+CtqrsfTeiF82gZ5tKJWQBwr9bRI2BaIdJ57D60PNMGA9hQE/bpvMyT0WG2kwon551P97l7EVjHongX+nMyhQOdFMMe1FmKda/AwIU3cA= X-MS-TrafficTypeDiagnostic: AM6PR03MB5607: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Sq0hfdHMlK/69GTmXEGqAQWTPQqzjOrMO0dTrMbKpx5XYMa8Od0yNu35gHiExJKNgL1hZ9y3HWuxp/Vy4Xbd9ee7jnoxQqmTXMaygFT6zIcwIIsBuffxNKXO87NseaSQY1rY5JnkfefQ14wOKBeQQJ1yPWTgey+lH6auzG+UxO4uDyZEcjGuP2zZX/mMb2x+pvbjfzBhUsvUeRPa1gg7EvOrCzWsOSJEHepMA+pqtq5NbpEnkQ6c9Mr7WdybaOE2HOF9s/wnhUPhekw+TlwCJG0sT6ZVr4Ts+03mLZBwi1YNNGOVrtbo4na9xgXPNLkpuQvsVZMLf6IdKI552JlYteUVkdgg/RtRAGNv/nygZDFgBdq1+7EYZxmndQZ9ZAHLe8QOEuCMDU77tX1qSr22P08Eoxm0H3mG17E4/sTPsoN4dcn4Rn0ToAZIH+dhEXB5 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HtxXtD6kl+wS3V3kJTokn56sIyrwfgNpJkqypTg0flaOJ5DIvPVUvvu0jyitvpD1PRwLr3YIX5GAKlyrCidWuErgrF0YeXluZP0Vof+ORAroJZry2x847qmEBftKLuY4CEsATGccffdOowoKgU8zPw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: abc82ca6-e7b8-4b1f-5310-08d95c58ab27 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2021 23:43:34.9965 (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: AM6PR03MB5607 Subject: [FFmpeg-devel] [PATCH 2/3] avfilter/avfilter: Use av_memdup where appropriate 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: I/Rm8dWeRGAe Signed-off-by: Andreas Rheinhardt --- libavfilter/avfilter.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 908e812b5c..c04aefcaa8 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -659,10 +659,9 @@ AVFilterContext *ff_filter_alloc(const AVFilter *filter, const char *inst_name) ret->nb_inputs = avfilter_pad_count(filter->inputs); if (ret->nb_inputs ) { - ret->input_pads = av_malloc_array(ret->nb_inputs, sizeof(AVFilterPad)); + ret->input_pads = av_memdup(filter->inputs, ret->nb_inputs * sizeof(*filter->inputs)); if (!ret->input_pads) goto err; - memcpy(ret->input_pads, filter->inputs, sizeof(AVFilterPad) * ret->nb_inputs); ret->inputs = av_mallocz_array(ret->nb_inputs, sizeof(AVFilterLink*)); if (!ret->inputs) goto err; @@ -670,10 +669,9 @@ AVFilterContext *ff_filter_alloc(const AVFilter *filter, const char *inst_name) ret->nb_outputs = avfilter_pad_count(filter->outputs); if (ret->nb_outputs) { - ret->output_pads = av_malloc_array(ret->nb_outputs, sizeof(AVFilterPad)); + ret->output_pads = av_memdup(filter->outputs, ret->nb_outputs * sizeof(*filter->outputs)); if (!ret->output_pads) goto err; - memcpy(ret->output_pads, filter->outputs, sizeof(AVFilterPad) * ret->nb_outputs); ret->outputs = av_mallocz_array(ret->nb_outputs, sizeof(AVFilterLink*)); if (!ret->outputs) goto err;