From patchwork Tue Jun 15 23:32:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28360 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:bbc9:0:0:0:0:0 with SMTP id c9csp125210ybk; Tue, 15 Jun 2021 16:38:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzFMsmI/wmoh1m0Vtnh6Ts6lGKWCO4fH9YcwYiI7ju42WNy1UZUxzbQTf25IOenan+hY/gx X-Received: by 2002:aa7:ccc1:: with SMTP id y1mr686638edt.333.1623800289350; Tue, 15 Jun 2021 16:38:09 -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 s13si296179edr.184.2021.06.15.16.38.08; Tue, 15 Jun 2021 16:38:09 -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=JmY7WMR2; 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 4A380689EC9; Wed, 16 Jun 2021 02:34:35 +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-am6eur05olkn2056.outbound.protection.outlook.com [40.92.91.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 87398689810 for ; Wed, 16 Jun 2021 02:34:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HiOnCpgeaksgVabBe6SZg7sb7d0a7TD+lIvvtxINrVDotOpXBX7usXA2BIXaf7ub5eKekDRCg7hdJ2nfsVh3cCursecp7Th4rd9R/jT4fTM0OCpmzyzkCLgUnWtYJ4+MCHDc8pznonZrKg6fexExqWx/mxbgfxRZEPBsbfyS8gvCe3GT0RrAyOGEJzFtbxr35w4K+UK0Q4ZUyGAICirMvcSV2/PvcrSU1mBVazRpuDztYgf5ve2O/dUKRJ4O7JTPsBA8mNy3OmCUNIViHhpB0gKeI2QT5cYIFB+BqEvl6bySVGWAUB71j+MhcIhmx58ZbFIXUfa3WiV6tjVTGKTh4g== 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=gT2MQJs2IO6XPXmwGpIfeH4dF+ctjbd2bl/NAT5eiVo=; b=E9Tma5uOG6KvCrUGuGrqBNQph8wCPp403NHvPlHe11W6ZstDsJlLzhdYsz0HaFEqJloM82eDbHRof2N69sUFF5aTdipZ79CIsl4MzRpGzyLNAWP6XHbOkL0VC++vujgS7pyPW26Xw9+g/XtZGvRBVTUBht6+zhA8LsBxpo8ET0462EGSsTGOcLX1/AilLKvlU+EwldzAG0x2GNiB+yQgONN1JT8LhB5QgDE0vMlnO+k2rH2vn2kFloSE59owaPcHVcnhnsUs+Ol06N1KiYvW2s5hvGgTOb/t8VfiHjkDBxQL9tZwWNksAGBeZ4x8CFHmFpL6Z5X0CSJWOMUfokpzDA== 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=gT2MQJs2IO6XPXmwGpIfeH4dF+ctjbd2bl/NAT5eiVo=; b=JmY7WMR2bp2327gVxh0ruJqPgI/gmyTu3B7uEum/gHij6gv19XVkQ32PYzTnvhN8Sj2Lbg6+hCW7MebZ6/SF47DOK90FiTK7j2ra6iPgole2h3AheiqtEqK5xFYx/6dswWwwJCJV3L6zp6vz8w7xTNeY/X7kHFkP9MYDzZBjYnt+dhYWySFmXkuhbdEte7MxdsSzIZZdsknagnO7kcfyO9myS4N08oG/1JgYMrF5QXpWBxa5n8j8suGDLE7WgOUS0yDS7hXiAfqV3TBQIbpq4g3dA5ILHhH+zZwEPvlvJIdo4lGuHLuxTZK5X85wM5CDfURFoSsUAtMwju3dmAVmvA== Received: from DB8EUR05FT030.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::42) by DB8EUR05HT009.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::415) 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:34:32 +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:34:32 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:2E8E67FA6C4F97F9547C72F8AFF7F80259FBE75687E9E79D0C95226B3E04BC8F; UpperCasedChecksum:54FD47F1542F162519A5EA405593DDD74842CF5C7AFA613AEA85F8F910B77406; SizeAsReceived:7766; Count:50 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:34:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Jun 2021 01:32:23 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [0qBGtuHfM3IU0goARWA2xUVy0B2INMa1] 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-33-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:34:02 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 50 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 67a15875-b4f7-4d54-6074-08d930560ed0 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR9SlwCHtPrt+MV8TUUwp4pQ3gFot+Jrk9mLI+N6jfyjPqZAVaEpqRj4QoGwg4weBa8jIV2yJSnHp2W+3XoAO3KMSsYVinpFdpWxJqvQk2jlRVRwMaTJXHcNbOCqnQwHCQYIR0FfbPOr1MYCg9sBxfkuo4ZPO/bgjFdKfHZTVdrD0HQKtGrCIIVTafoS99qQZKIIQDz++egZQoNDBtul44u1zF2f3coFfAr/Nh2kZ7V+V9mL8z8aiR/gYX0XI8NnxOvTdqGR58uLYq+UJlaKzW3lQTsOdEbPVxXXBnQwRsYom8pd5lhB8Dszbc2fC4tcoTcWeU5SBgVbo2yaZLaFq6fJu1Rs6V1F9h1HcwgGOszuchPFv67XIp+ZXxgDGBD2jnpoN9U9G7iUgn3OvtYSWa4Qp9srzsPvXOLEububsY+Joi5FdXy3noK8eW8dexZSP6uMsqqJC+Ty+rC8LvY1lTBVkJWlWZPk4DH9NbkpTM4nOiYQ4ubFgfu5t3WOuIJPJf+0Fc+TLg7kpR0fsqUJgYMlORXGJ6q5IGonDAhtVxndw6kMmOc2vKDXJeL8CSyA+YIFcUpeaCqCB5tZ6GVUfwRhlF4Y9ONxV4/FLp3kMQ4/qEDaihAESifHHBqOMGfgKnnB/7ilocqLweulwTyWdd4ACBtfULus8uSFpnO1A6ABfBYoqNi9Olie9gK3i3LdxJjvDizh0RHnR5JdSA+o3O7wsaBqEnlvk9lJaCsefG4f4m3WaNpCltich2QuBGnwmw= X-MS-TrafficTypeDiagnostic: DB8EUR05HT009: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fL6UMrQWdFLQt3cGUzQ0SaWw5UQyqgRVVE3OvETwV3ODVrBVpAUfpsq9+x1TjWQF27PmICT83hyyCsbDPKpAnpDdj1F4ngV0pT5hQohTkpTLRLxFqu+VYDLID6pAU4gW+wuXLEc4xc6ph9PAs2+D+goCtxO9BZkPSB2KhUlYmNNoURHYbCMq90t3i73sq9vlj8OYcn1t7ycbCC9su4ppxnAWExXaeiBEYv5pGzd8Rh62OXZgIJj47IT7SYmMA0astBVo+DW8pMcd+o4v8WmOcHdDFJQu89PqYjkhBFH8Oqs0THkQPMK7qCt2Z5pejXuBjGrDAIY8QrRZdfjC5hp4yMK3fQalMnSYl9X3q8GDlsgkSdWp+xOXeeS9Gq9VT11a6BpaLjBXAF4eewQqd8bMdA== X-MS-Exchange-AntiSpam-MessageData: Oz4FcGI4mBrLOYr5lxJ/kBYtj9V9lph3B5VgeTqKNb+IeGaxszHErwz88l1pxyelwQraGMeWX9C5oNWf29f+8PLSUPFJkvpdjk3pm5d0SdUxq5ymsoDXHbM0mGvK69e45bBPby5oYZUKJElTMLZwog== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 67a15875-b4f7-4d54-6074-08d930560ed0 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2021 23:34:02.5922 (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: DB8EUR05HT009 Subject: [FFmpeg-devel] [PATCH 34/54] avformat/paf: 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: BODQJHEIpqF8 Content-Length: 2019 by setting the FF_FMT_INIT_CLEANUP flag. Signed-off-by: Andreas Rheinhardt --- libavformat/paf.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/libavformat/paf.c b/libavformat/paf.c index f48b2e60cd..2d2d7f8dd8 100644 --- a/libavformat/paf.c +++ b/libavformat/paf.c @@ -172,22 +172,20 @@ static int read_header(AVFormatContext *s) !p->blocks_offset_table || !p->video_frame || !p->audio_frame || - !p->temp_audio_frame) { - ret = AVERROR(ENOMEM); - goto fail; - } + !p->temp_audio_frame) + return AVERROR(ENOMEM); avio_seek(pb, p->buffer_size, SEEK_SET); ret = read_table(s, p->blocks_count_table, p->nb_frames); if (ret < 0) - goto fail; + return ret; ret = read_table(s, p->frames_offset_table, p->nb_frames); if (ret < 0) - goto fail; + return ret; ret = read_table(s, p->blocks_offset_table, p->frame_blks); if (ret < 0) - goto fail; + return ret; p->got_audio = 0; p->current_frame = 0; @@ -196,11 +194,6 @@ static int read_header(AVFormatContext *s) avio_seek(pb, p->start_offset, SEEK_SET); return 0; - -fail: - read_close(s); - - return ret; } static int read_packet(AVFormatContext *s, AVPacket *pkt) @@ -275,6 +268,7 @@ const AVInputFormat ff_paf_demuxer = { .name = "paf", .long_name = NULL_IF_CONFIG_SMALL("Amazing Studio Packed Animation File"), .priv_data_size = sizeof(PAFDemuxContext), + .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = read_probe, .read_header = read_header, .read_packet = read_packet,