From patchwork Tue Jun 15 23:32:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28347 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp4311441iol; Tue, 15 Jun 2021 16:35:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwjjkDvULE8VFE4VhMI+cCsCVeh1+DXGE+v71xaEuZ4CHYFNVDuMc9x5e69RwwJrSDHAusm X-Received: by 2002:a05:6402:2317:: with SMTP id l23mr673329eda.265.1623800112171; Tue, 15 Jun 2021 16:35:12 -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 5si357889ejb.197.2021.06.15.16.35.11; Tue, 15 Jun 2021 16:35:12 -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=rHMlVTwM; 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 B8B73689A6F; Wed, 16 Jun 2021 02:33:28 +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-vi1eur05olkn2079.outbound.protection.outlook.com [40.92.90.79]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F33E9689985 for ; Wed, 16 Jun 2021 02:33:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AWlOEHh7D8nDPMOXtN38Tbg/VwYJgl7Q7g6NJ9vWwGxMNn1KW1Ooc42JrNDLoizdDxiCMaiO4OZojv4u+rjEkZS6wd/z2d2F2/bIBdYj7ksVC0gbGo2kLGVDauZ5CNfHCQsRLob7YlO0Inxb6b4vv3x9PCzj4Jbt5A82hfIMw8COtID+exYGRbQ/q2gOdMnUDXecx5g+TQAoZuponJrTLTH/3IB7dlUyg9oZUVG4ikSfgMmZ8IZRe/0TgwCyDvCtwjPuq8F+9sV3dlYm15UX/S3kGeqnytQxIBncjy3XMmMF6PBtTdhXaruLVW6qcXa+/0QI9eQJbGPzPownr6VEfA== 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=XN4d4rF2RI1quroFnrlyDN7MmK4xQMxNyqOllyC0nwQ=; b=eEw/YmdNjmQIrl/hNPKdr9Bcxf4XgMkIKyvvOdPewO2tW8ZzV+4NJ7uvBMVk++bsb8i1nVCHMUnawSsrFlA/MKr7chCzOLBgftAkI2L9MrYWxBI+U0Rwrepadvcn6Pv6HPxGf4qeFb5gIeE+dhoN5IhZyRf23cJvmc5jxLWlcprldh3RIwxnXn/sl0Z6pLVXF1dHtP05X3q75muSY8PUGTeaxxYbfEzjBdxQuzZZmBZ6M7mazU7C1C2OvGP9bvUfvZYxOdUkq4fQniBR4Ju9oSziBa0+ieuBOuHG60CWmP8Wk3ei/QuZgr8Y2aHCEDahhpiSuc+qPQMeHMqINIg5lw== 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=XN4d4rF2RI1quroFnrlyDN7MmK4xQMxNyqOllyC0nwQ=; b=rHMlVTwM5f3Gca4tw65jDXbL4AjvZ1864Tibvwx8jt74p5r2JGTeNey/sgg8zJEmVQ1SE237oZzmil3C/WFnnCLp9UbX8yi0N/A4sE8eMSk5DlsUt5P+aryEFe7SNJFWoQdlP0W2gztDfR0G2IZxf49HFu4FF+Y+mBGch/Cnqvd+7vaiNXh1LEw3Y2CPto05lb5fxE8t29tLPUoS5fNIguFDp0lrZTxxN+uxcsQNSgMyx0j5cQbH/jcPkk/TCfIlWUuoVHtcjh0utqLkBMpRdn563yRkJpho4NgAPACezMuJPmHdfFZC499EiRcnw6kDUH1dWbZ/Ypg4mstIDb5Y5g== Received: from DB8EUR05FT045.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::46) by DB8EUR05HT135.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::237) 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:23 +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:23 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:1D1D9E4CA08C06620B20EB940735A74E9F277704BC4395DACBC84E0CEB58E29A; UpperCasedChecksum:6BE197FD7DF4EE5CCE4DD6FC568EA9DE4359FB5F3588482264997F30A8BCF4AC; SizeAsReceived:7597; 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:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Jun 2021 01:32:05 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [8KqlP5MpyY8YRBcceckN/8xWgbqU5VlP] 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-15-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:22 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 006683f5-5084-493f-60f1-08d93055f760 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR9SlwCHtPrt+MV8TUUwp4pptWyrQdC/n4J7adcKN7I1HlOfOuLa0YFlIkuc4XcrjQlwmKSXXqcXGyuQzBGpfFGSg++wMomiiQ13bn26jQGEHyoU9myYPXsvELPGgzdrwBkpWCyNQqHyOwiXOd5YHdHYn1FxN4JDkfa/h6lJgXe+evGhwhDLhjeDXIKRqGYcCGaHb2o5Sw8QSDK7CagIYBVysqjwQqGIEdIiztzCSjdzli4mKWu3AqiDVSueUqcqHRO7D6Bcqr7UKPqe6i8LP6ddHOfSeHmjFXEKSZCHtSeu1ebCAkVko0r3QadQh2AYKtpgN9j/ivzvzgqPNaprXBcA95hhGlrkxJtyfowxarhzzZuNGbXjWpQPubwCJ9cimW1/4Y3PgvF5fFIa+q74ZWgPaJN6amNwzccjbGgjGRfnTdtP7aC8r6aV7DYxovhgYbwZ19Q5SqD0VSl1QKTSvOK8y3WJdYm/aTyoFhQZXS4yJFCYKkGvyV0qbpkW3yU42tC4GP8Po70LptrWMUAP9q8N3P+YCjaKspHHOqa4cTF9jsisK3eP90KkB8hpimnfVoGkQg+Hlq88t55wFNYrPojFurSBME3XHbejgJ032pTmnhTGMIh/QFx+800cQ6pPJAf7QmAPJKq+crXBQkmu78jw5WSIkTMyKQBM7TGpNugbCfEa2chiu5ZxKK62wO4oSgzBH8jX9MlpR54CgTfGtK5x/fcjhmNogSgyDNesIhUB109BM9lh3tu9Qy23hUHLyU= X-MS-TrafficTypeDiagnostic: DB8EUR05HT135: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tRka3Ujrn+cnEF9RlkZnDwlWSFzpsgzvs46PIcIU+85Z6hYQU30/OMkTMY934KfMMF98TKehhFc6w8CaGiBpXLh+YcK2rd4QrrAX+ElfSt0vS0VoBeZ7um4N67lyTqEumX+jctTcHZWhliG0Zjp1lXgPvXrlEOjUxnliMTmAryoCQY8r1C+qsvRPbdoSCB2qli6TlUj+AaANFiOewNXYpzR9Y+JmO/6yjVoWnuIwxzTLzWtB4m3jhvTtvAPHd24L2kdPIBdhJZTAMX/n05TlFQbRgUggJH/cjuUnQSlpjhOFqG/THEEC4S9Jy1HjT0yJPYUmubUBZIcFi3/2w16dLaIHnI5ObNJV/hCSGKMq2y4BNjwxIEvmR4sWBh2zKpEzBxEPZkqUF4zbSLbGuPrzFw== X-MS-Exchange-AntiSpam-MessageData: Ra2FxoT4CDUjJBa6zYUQT0bFH89EnYX5sLb6AtlSe7ITxZDRlPOXnY0Ye6WnpkHFFcHKkpNY7xVUq8PTl1ZxbapvwGqew6vD4zKPayxKr0YwxOV3HMhBuphNDjTGOL1MGnmr7fFZJvEJ/bdLVmFHhw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 006683f5-5084-493f-60f1-08d93055f760 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2021 23:33:23.2516 (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: DB8EUR05HT135 Subject: [FFmpeg-devel] [PATCH 16/54] avformat/jacosubdec: 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: D8RmRBVFEtRR by setting the FF_FMT_INIT_CLEANUP flag. Signed-off-by: Andreas Rheinhardt --- libavformat/jacosubdec.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libavformat/jacosubdec.c b/libavformat/jacosubdec.c index c8bded02fe..510219224f 100644 --- a/libavformat/jacosubdec.c +++ b/libavformat/jacosubdec.c @@ -200,8 +200,7 @@ static int jacosub_read_header(AVFormatContext *s) sub = ff_subtitles_queue_insert(&jacosub->q, line, len, merge_line); if (!sub) { av_bprint_finalize(&header, NULL); - ret = AVERROR(ENOMEM); - goto fail; + return AVERROR(ENOMEM); } sub->pos = pos; merge_line = len > 1 && !strcmp(&line[len - 2], "\\\n"); @@ -246,7 +245,7 @@ static int jacosub_read_header(AVFormatContext *s) /* general/essential directives in the extradata */ ret = ff_bprint_to_codecpar_extradata(st->codecpar, &header); if (ret < 0) - goto fail; + return ret; /* SHIFT and TIMERES affect the whole script so packet timing can only be * done in a second pass */ @@ -257,9 +256,6 @@ static int jacosub_read_header(AVFormatContext *s) ff_subtitles_queue_finalize(s, &jacosub->q); return 0; -fail: - jacosub_read_close(s); - return ret; } static int jacosub_read_packet(AVFormatContext *s, AVPacket *pkt) @@ -280,6 +276,7 @@ const AVInputFormat ff_jacosub_demuxer = { .name = "jacosub", .long_name = NULL_IF_CONFIG_SMALL("JACOsub subtitle format"), .priv_data_size = sizeof(JACOsubContext), + .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = jacosub_probe, .read_header = jacosub_read_header, .read_packet = jacosub_read_packet,