From patchwork Tue Jun 15 23:32:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28345 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp4312269iol; Tue, 15 Jun 2021 16:36:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwm/8JrbW9xXh3hbcY8ueZa7NY85j6cE5OsEsjYqRgKeb0+Q+ENhhBxNC+u0jjkn7Nh93Ah X-Received: by 2002:aa7:dd14:: with SMTP id i20mr733363edv.110.1623800188254; Tue, 15 Jun 2021 16:36:28 -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 yh29si450917ejb.42.2021.06.15.16.36.27; Tue, 15 Jun 2021 16:36:28 -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=JRWxLMjE; 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 47CF8689CDB; Wed, 16 Jun 2021 02:33:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2053.outbound.protection.outlook.com [40.92.91.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0E6AD689BDB for ; Wed, 16 Jun 2021 02:33:34 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jbYZlIoiVog3oK34AWX6g1nSwDP1C8kYz6nj59qisxxHiYimtG21Xjy2xx9oPhqGBXYahbV1pbWbklLxZUAYv/ou5MdqWzSRGpzKWX/+0H/EslPfkhQBSuEJH0FG88CQW8bf6uvZ+1N6aEgdMRqqylGKw8jV2YEWRbbrY1BmRov98dVch9CJFMgZuZ6uGl7fgEcZ1SP9dyyFQcadNv7DvIaOyWucqCz+zlN20niYyfa8cwfoERCd/xZnh9fcLmKhJNOaa0iVLzloBsUQrs34mx6iZFDceq5Fv2alH/HJ1g804cRa55ipeBtAdgD72JbRKVJb2GZ0YmrAwaJpJ3tWKA== 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=Qs0oROoMOsL+VOrog3I46xlWsZ8zKeiD5cWBrATYBmY=; b=HMtN8X/jzMIY4rGdf6+YmXSqDG7gzKxAzHzbU7EdUi8/U6JXv4a3vNgvz22WgtnjcGDvhbQb+gzc+FDP+B4X21RsQnLJn7iOhNkj8p57z9+fLz+dhIUXy5Ut2JmxLvz5hYfrv0TKn/YxRpBlx9OB8JCmn1Wxnrmpzlr4/vjSXQ66YJ8pvpE6kXKNTJcAGDZhkr6LWnsTo7q4xE0LvoYxUtx+ZxonvG5axqz1PaJ/zkxZthoUWXfXRqn300ce9zxXACgzAJjojqVRSnNY07J5B6PnngyFaS5TlnL22ZVfL44636W7jcMcnWT6yqcVOgsh1vPTJuhMcT5StThqu2PyxQ== 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=Qs0oROoMOsL+VOrog3I46xlWsZ8zKeiD5cWBrATYBmY=; b=JRWxLMjEHbfaglpOnsd1mhAZRFoJ4/3LaS7S65NhBrqeObnpZ1ScEfckZKKDhyRnVswuixu3incHRp/P6sSFvak63cLgIBIydGVAXOeNkySk2uTPibiSCFyUgzDnSNb3jwbpwZElJFRFdOnAB7xSNIME8QyXVHVEjz/bS4/SchliN4mgBv+5SMphWcctgkb4+9rjVarKosyO6rH+dG77rald4l2LCiMDeN0uT46XJJLJ/wRL1zRoAUm1Jv26wLJksXGJ0zQe+5FvIcxDwElcgsQ5Tin9Gm8Gk3Zs5WJpyCLmxW0EQrOepTzpknDwREpqNxyREYzpa6tpeM0ZWW89jQ== Received: from DB8EUR05FT030.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::41) by DB8EUR05HT003.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::120) 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:33 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc0f::40) by DB8EUR05FT030.mail.protection.outlook.com (2a01:111:e400:fc0f::228) 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:33 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:3D84E1F6430B94251A3B1D2DD1728BAFA0A436789B938FB49BB8AFA032F733AE; UpperCasedChecksum:68711C366560606B2B8C1A442F3FF4C836FFBB96C5242198212A6381DF1AB818; SizeAsReceived:7598; 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:33 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Jun 2021 01:32:12 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [wyAbTKV+CqgtqmhOdKBHP60omkUrpw9u] 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-22-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:32 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: aa7d83c5-0138-4f65-f472-08d93055fd56 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR9SlwCHtPrt+MV8TUUwp4pptWyrQdC/n4p9PDP/HNk3thI8nQrnqw2wFFE5pqWgixpvwKcG5Jvtw5eHeUosNQLm3kWO7H/UZkbLjW9tw2kTcADtW9IzgLcnQiewrqaEItVS5PLJsU6CXLThvWliHzZ5t3xmvmsSU4+e/kgOIIwz9BREVQUlwFT5UwYMt3G02TSXuJ0cs3hGm3ypPn+g87EQa6V3YWbv2ya1XuSAdKE7lbxZ3K4zYjO6JXBfHXOPpVUtjbBeTtsU2siPBWixC+2Twdp+GhRh3GnH2I9S+f8ZrXUaE/LzFygVg23hjRqJqY/EWMhktV7/wHNMKoAn10bT41KvJvVQOQddmBnWUSbZrDiR2sPlXr3n7A9SYcyhl+IgqL5SaGfWnJdf7KK/KzDbP5gIebEsjtpTcvrLWqCs2sUTZvVgPN3sW1wOlRYAcDCXxx2r/xikOB6mq7GC9E7tNlPqiuoX15oG8e4x1BbZsANX0ib8REOP/MYstiQl9Xb7eLeI6AJBY8n8dbSAoO3/DpJGxfNxAKORmP+I7U9NN0P7T2EOeLHk+tBzJOymCZRUgpSIwqYZXhKcz1kdyjOjcRlDsCaLswhnlkm5THHqhMfyJHpiDHbfcGDN/aFZH3SAmdZhkdPVK4LYLqOf+Ss+N/fSTh7oASeGPckBLYA01KDUjTXXWNVgALZoLIM3nQjLUpW2IcUYGe7IqLbg7YzjP/vqxY2oFJS/oXdSFwEMGDMqUQyCmHkQ+VwORJ2TYM= X-MS-TrafficTypeDiagnostic: DB8EUR05HT003: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LlR7jWgQdRcHWJpytLpBx3JlkUKLwSVyorhZB9B/Vu/a1W5n6+4UbwbsM3NjWJuCTV9LiyjS/mdAXaC4ZVU5TREhtoHuVIE6dYklIOctqbPpY23KEcogJoNuEF+ntDx1h9FRZNqhN3TQ6HF4HnqQ8ZmvE+eGtJI3c/ZKlyY8qJJnSxvBxx/yT2SlSJJ6AIGnwUX641QOVGIk9d/1/wIG/dyLvy8bvpSKvfys4sioxgvh/7BnyrPDMSfXkguyR/xenMfIKAWfGcANwVwVfwahfHJLuEbRkvG/1huCx1sb+DDXAohTSD1YimIUa0IIHKqweeZfh4Oab84e4X/qdLpy5siU4SjD31LQXlRhxmDIWBthTUsdsEISGIJdGnfSOMDiRfU9fHnmB29h0tT3aOCcPA== X-MS-Exchange-AntiSpam-MessageData: j07aa5uTQyEE/8/AF5a1XUpAsm8tQdSHRHYnrQ3FVE+KVwkErg2s65I45PYprMsuC+6gQq4FGXJd2+TDgKcwfxLViiCyeyIsI1+SsPtxkp0xdtR8DD9Rxl/kXncvrpZ9DlOObURwgTbxkobHpO9jBg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: aa7d83c5-0138-4f65-f472-08d93055fd56 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2021 23:33:33.2922 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR05FT030.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: DB8EUR05HT003 Subject: [FFmpeg-devel] [PATCH 23/54] avformat/microdvddec: 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: HY5UFn2LYWIs by setting the FF_FMT_INIT_CLEANUP flag. Signed-off-by: Andreas Rheinhardt --- libavformat/microdvddec.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/libavformat/microdvddec.c b/libavformat/microdvddec.c index 3c45c72595..e536d12b85 100644 --- a/libavformat/microdvddec.c +++ b/libavformat/microdvddec.c @@ -121,7 +121,7 @@ static int microdvd_read_header(AVFormatContext *s) int size = strlen(line + 11); ret = ff_alloc_extradata(st->codecpar, size); if (ret < 0) - goto fail; + return ret; memcpy(st->codecpar->extradata, line + 11, size); continue; } @@ -142,10 +142,8 @@ static int microdvd_read_header(AVFormatContext *s) if (pts == AV_NOPTS_VALUE) continue; sub = ff_subtitles_queue_insert(µdvd->q, p, strlen(p), 0); - if (!sub) { - ret = AVERROR(ENOMEM); - goto fail; - } + if (!sub) + return AVERROR(ENOMEM); sub->pos = pos; sub->pts = pts; sub->duration = get_duration(line); @@ -162,9 +160,6 @@ static int microdvd_read_header(AVFormatContext *s) st->codecpar->codec_type = AVMEDIA_TYPE_SUBTITLE; st->codecpar->codec_id = AV_CODEC_ID_MICRODVD; return 0; -fail: - ff_subtitles_queue_clean(µdvd->q); - return ret; } static int microdvd_read_packet(AVFormatContext *s, AVPacket *pkt) @@ -207,6 +202,7 @@ const AVInputFormat ff_microdvd_demuxer = { .name = "microdvd", .long_name = NULL_IF_CONFIG_SMALL("MicroDVD subtitle format"), .priv_data_size = sizeof(MicroDVDContext), + .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = microdvd_probe, .read_header = microdvd_read_header, .read_packet = microdvd_read_packet,