From patchwork Tue Jun 15 23:32:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28333 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp4311099iol; Tue, 15 Jun 2021 16:34:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwzCuw2Ug2JmpQ31hgNzWqkGlrmyqRQtM0QAv3xaywMnGlh0DbM5WNcca8EpC1lMJm41C4O X-Received: by 2002:a17:907:2642:: with SMTP id ar2mr364040ejc.391.1623800078428; Tue, 15 Jun 2021 16:34:38 -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 v12si272815edw.236.2021.06.15.16.34.38; Tue, 15 Jun 2021 16:34:38 -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=Uj+slFgE; 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 0AC6E689905; Wed, 16 Jun 2021 02:33:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2034.outbound.protection.outlook.com [40.92.89.34]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CDC7C689910 for ; Wed, 16 Jun 2021 02:33:19 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RsOt5yr27qJV6pLD4pDAm2j8oZL2EMYZyR71YL2gcjpb5/O5MP2gaCjzE+r+FNnpvgtmo2QmM0lqJYYlkQkRLjwUxYjjz9RJJD7wGH+s2OvTnMOe5tvRrO0h2qopmdkRCzV4oKc8xY1tb+QMGCHihFMl4LJ3m9A7NCGKvSH7NXv5iPnJsxCMIX2FcVB9fgTOAqig+tlU09eJOoqBmD9qIThEK5oRmIZyH2fYPd2Wdcbz3IFXZoE6CwpF6k102UmfB9jFeBEEDBCK6OZc9MQENYm6uzLHM1ZCxZlG6Jk4FGN0By1f2SlOTjHSV/HYteluPOLeHo9HQuKvy+3y57rChQ== 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=1eRbiY8P3adJQk2ZDHvwRqaUyAFf6XpHQzEInK7Jy4Q=; b=U4hHJhnD9c5XpV0aicV5BsV+VceMOLACmor3LZHFNPtsU9EKXoCS12+afvdnpLnyrkJXi1oV2CoTFKDVwn9NK8uNtAOmlLI820Vi6Karq0Jd7Oj4U/KbCEoSzaXYjOMfg8jS8/odJ6PWZuQdchRh/4roQd0KQA/NnQxL2qMuDrn1XFPk0My22OIh8iDzzAGBRZXP8IcanJ7oIpHsWYKqajTrDiH0NeMmkUgmraXGNjpOQQ55Reu7EaCiGZ3Nj+agerLphkK+pgLV4sMExh6qMMChs+boboE35M6Md+Vy+yfc9EsAYAbojvOG3OlUA4AD3u6h+hX1q7DLszRkUL0D4g== 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=1eRbiY8P3adJQk2ZDHvwRqaUyAFf6XpHQzEInK7Jy4Q=; b=Uj+slFgEl1naadsPXGfVFejX+KQFIpK4HU4bPUbI+k60PPumAqSPx0bgW+LXeYcBErKuGoyxegn1VewcJBfL+ctpFsIvZKcFfBU9IE7rsPJvELQ19oyegeDr0Q5U+XeN72IGvhBjKm1PiQYtA0EWNHTdCICROfFTMknQNCeyA7Lwsw23NBip3iroRlfY3riXSiRFTWdmWfeqqRiW2VAqZ9ONWDAvobrd9qQQ3gqNHE1hXgz+mhlVWn6pLLTG8ZEovQ0OwSfY3IHUcG9jYF18E+ylPCdQdLY3vFV7XafKND0S+RrwnGWyuq4CSiRV0y3Z31uNI5mZL7fStVBGDY5+Pg== Received: from DB8EUR05FT045.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::45) by DB8EUR05HT230.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::116) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21; Tue, 15 Jun 2021 23:33:18 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc0f::46) by DB8EUR05FT045.mail.protection.outlook.com (2a01:111:e400:fc0f::383) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.16 via Frontend Transport; Tue, 15 Jun 2021 23:33:18 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:01F13D19C3C63FB9F220236BCFAD5144150EF7FC1C5480F17C77F0AED9784C49; UpperCasedChecksum:7E52596A22A38BCFBC2704F851D33B67C8CA426F1C5017CF6BB32E48962B1E70; SizeAsReceived:7596; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::f4cc:63fc:9cef:37fb]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::f4cc:63fc:9cef:37fb%6]) with mapi id 15.20.4219.025; Tue, 15 Jun 2021 23:33:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Jun 2021 01:32:01 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [UJyvmvX7wXXg0e7QClNAl555Hu1RJlOC] X-ClientProxiedBy: PR3P189CA0063.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:b4::8) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210615233243.1173928-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.97.82) by PR3P189CA0063.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:b4::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20 via Frontend Transport; Tue, 15 Jun 2021 23:33:17 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: dac01be9-1714-414c-caf0-08d93055f46c X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR9SlwCHtPrt+MV8TUUwp4pptWyrQdC/n7LELivV0hd91wqBnvij8hMw6UuNV9V4KMccF38yJ3HF+dDgTUcXcMdtI9TijfG5YBiRWAUCWsXtXx5iXrw6n0zx7Y+MmtIRNXfqWQ+IZjjBgfuAUD+mTMu+GgdIODj6J7WF5bMiNHCcLC1c+67mHV0JOGT+g2h6fITpmo2bzIioM4xU7oEAXpCS/dZGz05q8fgBZdd2xmBoxr4L7/vGO2RenvlOVel3ls4GzEELi4dFQnwzP+7s7cqjy9v2iQqWMos2155YRG5WEj9HW86Ll+AG5WS2TAARkhkK2rLr7/uTOAA4vd/C50cpVB8nWHSYIK1ft92/HARxQOntzUjONDThGd1uU8YCFk/ZCdeTmf2mX3FYz558ZXHOpK9Xm3qd3Gp8+FDS88bWcJ76qTzlE5aWfB6hZn+zNIgZkhc7swUu/UkW8f74z5WOKv3unUTbugmvIHGMYVJ18sZ20kOfCNFZZw9+pnkR1NBR0zrGIE+ikPaEp3lzy/GKn6Ql1Juhs+7mzNZbySE82FXZRyrfS4+r6E0Orfc6NUvt66BokiMNT48NMSGlz/Y2vTWAe10Y7vM6WGVvuxypkvbqOqs/6Yn8rpdmz6X3Wc+zL995k75DNfgmDSKVK15wZtcsyJfmIcy4XTub+MMcKUsUzRrKWW+LUZ07bY1qQ3FtJoViRzfZKMA/ckl6fo3KrvyszzMiu598TNkote05A5kIG4wzzdR+W0fQFE+3uM= X-MS-TrafficTypeDiagnostic: DB8EUR05HT230: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iknWnm/mbFQCU0bFkf/PTjANtVlMFDbBB23ebHPRfvGFoHD7lDziVsFKP7dLjK+F2hRCdqWcYs9TGirZuFFKM/caUMOIRmitpqOTskQGHgQXUrIK8HBcKWwmRPt1NmdxLZ8jtfjgNraNMZift0bwu7UL27VuKml9nagVcZor4g/RW5V0XQn6hPfXUizQnWCs2lmha/0kqUOWKQu+htGuazu+wDuU36NG2zRX4gLGApyPrq9+RtHanCGxtNG+qgNVO7rO+yx+0QRJqkgRqWvIvUyt2Lw1aWnOk/qafrdeH0euU49WSd9Nlw3+ZEqy+lu4GnGMbYfl/tRVv/y+uTZ7MR+jb5nDudrkfFXbA7peq+rPXciKj8LcS/UECoAsVxrBc1uqxSjvUPpFjSO7m4PKPg== X-MS-Exchange-AntiSpam-MessageData: cXK2i2ihVu+1wV1qqMR6eu9AZ75RDgQP33o1DgMcJumwKKST/tC0bOdykaUWR9udMi6XcuFzPymtL/1FpUInYmnATCPvVyc/EhH7QYRB+e5cLRhSUVGNCLbvH/zQ3blrHIjPEHVijZ3xuFbYOGKudA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dac01be9-1714-414c-caf0-08d93055f46c X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2021 23:33:18.3618 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR05FT045.eop-eur05.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8EUR05HT230 Subject: [FFmpeg-devel] [PATCH 12/54] avformat/concatdec: Simplify cleanup after read_header failure 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: GWrxfSvLDkeV by setting the FF_FMT_INIT_CLEANUP flag. (Btw: concat_read_close() is not idempotent (it frees cat->files, but doesn't reset cat->nb_files), so this demuxer was incompatible with simply calling read_close generically upon read_header failure.) Signed-off-by: Andreas Rheinhardt --- libavformat/concatdec.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index 6d77398f48..96b4b96962 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -510,12 +510,9 @@ static int concat_read_header(AVFormatContext *avf) MATCH_ONE_TO_ONE; if ((ret = open_file(avf, 0)) < 0) goto fail; - av_bprint_finalize(&bp, NULL); - return 0; fail: av_bprint_finalize(&bp, NULL); - concat_read_close(avf); return ret; } @@ -779,6 +776,7 @@ const AVInputFormat ff_concat_demuxer = { .name = "concat", .long_name = NULL_IF_CONFIG_SMALL("Virtual concatenation script"), .priv_data_size = sizeof(ConcatContext), + .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = concat_probe, .read_header = concat_read_header, .read_packet = concat_read_packet,