From patchwork Mon Sep 6 02:27:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30029 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3374561iov; Sun, 5 Sep 2021 19:31:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy2rKMST5XYe9mhseY46LRgIC885+jQfv7PjMsh8YZdW6tzwAEfIXHRFgkJmd/QUyQ6EQIJ X-Received: by 2002:a05:6402:1cb9:: with SMTP id cz25mr11327626edb.11.1630895474576; Sun, 05 Sep 2021 19:31:14 -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 h18si6649939ejt.663.2021.09.05.19.31.14; Sun, 05 Sep 2021 19:31:14 -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=KFm5ODr3; 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 A31A568A7E5; Mon, 6 Sep 2021 05:28:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-oln040092071040.outbound.protection.outlook.com [40.92.71.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C8ACE68A7BB for ; Mon, 6 Sep 2021 05:28:36 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DhiWCCi2NccRo+RRRCFrKIpnOKCkJqg4mV+jd8oZRtb2weRjVfkxVzl7IeSKiu2EsIy4J3/w/7eqCpFQc8JAupXyVAp0kuPE4qvnJNTFVi8e4s70Nn1+ktVXIjXDcAFgURzAkrj4ucaXgiUl5+MDmjD9KSYG54qOvRSLXw8ClUFYSZB7kZapiTtqFC5s4jSRoErLvvrhc7GkdIvy8XNubwe7wk7sRXe4gFIfi1zYekVppQDi3QvFikN7x9K3FitrjKOok7Kn+2S2Sk5G50/BnWXlBdVNi2ilttLE+e667bfMN44OlysUg0rKtm8tsJpCiBIB9kw7n5C1sA9oDsxIRw== 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; bh=xAjHzSeU8rhPs8GBE3BVi33/F4+ti803c6fgv139k8E=; b=RVyNr1aC9gUQpBAwYv9lNuRdDYHt5JZJD0v+kIywWCXA1rW4/hC+mIjCEEvMEstlkhzT/wdp1BrdSlotWxEcevAHZtasUwe5OzDorMo522XVi3N6O9C+ZWJi5f1JOk1EJ+PaRXZnuC6hBhF+zEuar4mzQBYYj+AYr8j9NwGNRPjlK33YWBSBQ5z2uKsUXmxrovTwxMq9r7/aw/viljhTX+uWsgpWhxzEJHPwwZFLbav+xFzHaYgqt6NUbLCvV8hMiVg7bpSzBKxB2OAyV1ILzl1o/gGY9lkmb/BOQMtA2oJNPBr9OSXqAqBtcap8xfrc3VfrKQy87aNg7KBuh1nXcA== 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=xAjHzSeU8rhPs8GBE3BVi33/F4+ti803c6fgv139k8E=; b=KFm5ODr3EiLG2urO1z1DL7lGYc8CCutGLDhCxJKOVE/8Yf23LDHhy/GGHzu7paj8kI04nmmNIXWbBlzOyWny04eir4GNrskqfu9kX+DnHPKYe26p2vVtn+/wKrPZWwLKYhIgsfJqBTSci1ugGCYCo74fH7gwt5dT2FRjuYFIn+eWakknZUFkWbHRS9bs2biF+ngU3WXFZo94DaC+IWNYROQSmypZGR7+8zthQ3nzki/TBqe5N5aZuFYYwBq07xhWsAsOD2kZy2IbNIm10El6HZfSaedaBVuQSXgj2b3hJpbnbBBvo9fJk1L8LaHQWGV9Lv0Wl8RTsi7f3odq/wFIfA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5380.eurprd03.prod.outlook.com (2603:10a6:20b:c9::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19; Mon, 6 Sep 2021 02:28:31 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4478.025; Mon, 6 Sep 2021 02:28:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Sep 2021 04:27:59 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [WU/4QAyVCyWDS7i0jdC3yEmZCMcGvSo4] X-ClientProxiedBy: PR1PR01CA0033.eurprd01.prod.exchangelabs.com (2603:10a6:102::46) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210906022802.4072793-20-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR1PR01CA0033.eurprd01.prod.exchangelabs.com (2603:10a6:102::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Mon, 6 Sep 2021 02:28:31 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3a630118-eccc-4f8e-42f7-08d970de04ad X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQPQD6tvsiQeosiZzDpp5hDJ2oeJFnkWPq7wV3pnI4+NiTJYFuay9q7HYxLqOCKk739Okb8/ZSLng8KOBQqpNLAGe3MO11EFmSLI8dmG+xUWQtVeKogEQOAk6yWtSdPEfWhBmQmu1c3u5/kblJnCigLte7sNg/rZ8pWl0lMtFhUhGWVgMs0x34VUG8QJtDZ23AS76hPMEFJI/nSJvgwmD8hqQ9hyF6KK+CZ+iWnueGjx9+xpf9Rmo6NSVHDPGxlkJjFgUPhubgaYgJsf2YYXvaVFrjlFGfVAl8xGymwHyl4+1Xu6s+2oqtoFQGfgAvBxptzAAJyqmHlMs8YKHCaoPKdcUzZ4/pJlEBNd51jwxMqt9wI1MAc+PmPhc1decs6/uFQbu4X4LAtiwRnCyiEVkhsRU6MRi5SRKG2coDrOBdoTExBIolUCVPX2irRyfEcMq7YvKuJv01liKoGvj5pc30QZeZ7mpDe9OVhgqMtEuzY44dFro/shE5TwutzHWEn+RnviEA2c11jZ8EzOaGBE+ODQihF0S78yrB6Pjxj0SCfZPzjh5z3YnyDTZqv/IQQPQsx91YZ48xdHytY2E4d3Bf6gLV/nCbZbCrsqpi+ReUsLattrNSqqYn6wtA0rRMhwBSJJUkqc138pxNee9zSTGan72UzT0V9RAtgRhrKqsgJRqbovWhG7FI6dR2jBmyGjMOEgn8pXQVQsYlP9cYw7j55uvQZWV50UYcADXmigbVLUzrCxhmqe7CPTNV/OoU8SO0= X-MS-TrafficTypeDiagnostic: AM6PR03MB5380: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: l1F4j6wvxZtv91r/5uUOTOKDgmviRQnKJbGqdgHADe2TvuL+v7DbU96aHTioAxTLBGP/mcbV25c2kIEvUVpg1KLQkJKJvkRKIM5181XgV2WopXOuHVahjyak/CHpJxVfcEv0wMzcSSB7EJ7NsAknTo3f3MlDJ3kjfUpb/ng7dt5BAQOVZe/lU1EOAn5Vrehu55qukkyMFM5OUZPXGnBzmNloyIuvJ73MZyjarv3aIYYgQOZGpTrRfP1E2j2xrgLSdchv6yYg/eogvkgpMgu2AEGn/qRCkdoRAXEWHJ0LNcAUz1riUH9A+Col1Wx20BbHOnci89SVGrT4xBip8f8l+MHBdrAephqRUM7sth0NSqfArm3+/dCHVAg7UrIPmhHjGqLNGC+NjtMZqOadYrPAEd/rdR0AIVNa2r+O6E3UW6VMu02LzMQ5C4aSmPtkVCN6 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TYM6cvs5xqwdOEK0GEi2+cSY2QcyD7JMa/DPzYlpLx7NlbcXRxX94JWEn6o6yb7XL34OGnzgK1gzbW/+zJY1J0pTRrNgxWMm1/9F4TK2kmWo6ASis4R6allnEZwZLRdm6iMK3BCcx/x85xE8RwD9cg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3a630118-eccc-4f8e-42f7-08d970de04ad X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2021 02:28:31.5111 (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: AM6PR03MB5380 Subject: [FFmpeg-devel] [PATCH 31/34] avformat/tee: Fix leak of FIFO-options dictionary 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: VX4eBtY0W+Uf Happened for all slaves which didn't use the FIFO. Signed-off-by: Andreas Rheinhardt --- libavformat/tee.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/tee.c b/libavformat/tee.c index 03356da6c0..4129954172 100644 --- a/libavformat/tee.c +++ b/libavformat/tee.c @@ -125,6 +125,7 @@ static int close_slave(TeeSlave *tee_slave) unsigned i; int ret = 0; + av_dict_free(&tee_slave->fifo_options); avf = tee_slave->avf; if (!avf) return 0; @@ -230,6 +231,7 @@ static int open_slave(AVFormatContext *avf, char *slave, TeeSlave *tee_slave) av_dict_free(&options); options = tee_slave->fifo_options; + tee_slave->fifo_options = NULL; } ret = avformat_alloc_output_context2(&avf2, NULL, tee_slave->use_fifo ? "fifo" :format, filename);