From patchwork Fri May 17 18:21:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48962 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp3049253pzb; Fri, 17 May 2024 11:22:04 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWBg45eV4xO5RrSRN3NIBBigLFPXdak9KtlyJX6kAw9tDwFdjxLzvBZ5I7f8ZsrLeNsbgVv6qxGdCnDZCICt8vaFrYqb+nRlSlMmw== X-Google-Smtp-Source: AGHT+IHvtJ6WiUSrwK8e8Zg/EunDyZwwNUoPWthGiS9qSW6z61sGyeyffuFHiWuF4Zx2S0BeeRLy X-Received: by 2002:a2e:8906:0:b0:2da:c3a:2546 with SMTP id 38308e7fff4ca-2e51ff65aa9mr165769001fa.21.1715970124251; Fri, 17 May 2024 11:22:04 -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 38308e7fff4ca-2e6f35d9a13si21288531fa.329.2024.05.17.11.22.03; Fri, 17 May 2024 11:22:04 -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=GUTwC2uX; 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 7114068D154; Fri, 17 May 2024 21:21:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2054.outbound.protection.outlook.com [40.92.73.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E9A4568CF0E for ; Fri, 17 May 2024 21:21:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FCMEsrVdnC+U7PztRoPLcGb7GVwQRs+EZ/2EM8M+PLHifhOjVlFPrhQkejm4For/H8uKPrw/zd95mjFjyCrnFzTg7oG/j087gORXqqH4Pp+e2im9qWrdd0FY2M6u8kSL+XdsOBrRhJ2HGtlODsjjYWmbqYuRTxEUrJohWG6lANVhRE/eeMP1WdmVn6TW1prKivqp7I+9t8VYIO/InIixorARB5ryrPxXxo9s7KgXmdl4A85Cp9DeNPMvzXtaANMik8w0/Fza+ee7x0ffwnTBoRSYWgfbF+5JUkETihkFt4lAaKq7/tSdkLCwYG5xTF6PhP+vYtrxgunjlgRU3mPDNg== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=qnJx9/DOIL9sfw0x2GvAi0070Fud3YozOD3J02rsOsg=; b=NRunqbT4rG6GIxRS0aJKq4h+0oelHqOTAzVZ1p3SmHhfWn/wDlMFjQnFM+FLQYBLHEYNpM4UPQ4bb/64+yzghMunwLDL41k0H6HssOIXXSa6XtGoEVNdJ+XgdKHC3ERg1JJ0tUwGcwcfJiL6ELlLRrscz/Ina5UD2wzVh3rLUnNeJIxUy2zH1pDlAT45484dbYmH0dKd99CnBnH/1YHOkOFi+jI/6PjPeOkrQQOZ2O1cLKP27lHiUsItDfng4W7b5NWmj1rWDRN9MIBhHW7F6+QZHpV4Vdq9dCPLeBb82Lhsa1U7QXOZWguAUUSXZiBtOfiefgxtjXNd3g+Lnolmvw== 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=qnJx9/DOIL9sfw0x2GvAi0070Fud3YozOD3J02rsOsg=; b=GUTwC2uXgTGW0/5IXYtvC83vl01qks5RAyRYbdf1sCYSuo7/YnH7yLRdtBoHaEQzKcMvTcO4plgrLDUUKGBeukM+Ci8cHYcZHaRjy9sv4AS+SBRlreFsgS3fCyrxJRWbTgLKiKRIky8Be2NYs+YH+zyKWGz00ohtbt4hpfW3JPUosuiOkQvAJwY7OkAaz9srYuLn26oC9eE5OvKjneWuv/Jnvc0R8j2UU4wQoZ2QZCRGtLA2HGS8xyH5O9na7FZDMY8T+nE9SRE1HZF5BtwO9yzcdqZ5EWJl6Wt1Z/Qqg/7sWlDuhxecoa8v7JEHSMsmIzHdl/GAGDTw0fxenCeGwA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PAXP250MB0446.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:276::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.27; Fri, 17 May 2024 18:21:50 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7544.052; Fri, 17 May 2024 18:21:50 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 May 2024 20:21:42 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [9P+ixITgnJUojdzTg4plh0pxJw1UAp77P7tZUnSQxDo=] X-ClientProxiedBy: FR5P281CA0010.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f2::11) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240517182142.100850-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PAXP250MB0446:EE_ X-MS-Office365-Filtering-Correlation-Id: ec687e03-a0a4-4be9-9e7e-08dc769e3826 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: W6NHTeBvespj9lgdO9AmDJpV1Cf/MUaAzv94/KMLxfOxXLnwfSaKXCLm/W0zbHu0t3YntSocfQQlX1QwKw6CndE5Sn5FIQkfwe/OtTcq5alxzHpKmAR+NWmL3XIrd499geuh/faMpHWC+n7EUNhiwcFmw6NPC/OhZ+sUOBIo7Mw8HoOMdIMcdrSt/Vk9+WrvARUGc2x63Bs0NVwCzfqbo70T8vKJukhXYMSTF4bJwp2jPZNb+Pei+O7/EuE4bbOOV9uYmRjhqnxU7OGU0VvQHUzlxjS6HpwPSi+445LmiNCmsy5+Jq+hafiwUj8M3SdgQitGi3rwX0y0BnBhmqvjszo+wXicgXBcRvLXGIK57Hit6McdOEtKKoqKIaeAVwsXbGM88AgqR0Nugoelh2wx7Pxxcv+MZ9IIX+EmhTEnHuxX73r8MZsUT/bWCYV3oeJwUdVvmoboRQraK7k66Z4gM+CwIBM54yc5vtsHcF39wDToIVKHP8cgamsK4Eb+883wzq5Vr70Od75jNKnVzWvub/0NAmDyrZUxcw4ejNzyV8jSG9GnC6tVpVUREioTiBo2fWubFxK9RYHRRhznnQNLNTWXUO0HIHJLZkO/Zoggyk5jYNA5YkkwCg7Lh1uIKbho X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8rmwLIEQEp57oPct6jZ9TwvynAKi8bzszvUxwpYCe2DWcpdhw9CLUNdJ8Zuj9DEX5DYvAifYMkoyE9gxvlQXQob3L2dMdfwEew86GgD4jZcRhnWDIIspehafkqIKCi7n4PTfsIu9gSoTaT0HiOi4gQvZQ6GaZKuLsLdd8M/TuQFqoBwqOaY5Y4pFuFtjU7ut8BNjQ9aPyyFCB0LiMkJOATfL6JZ4E2vZw6IfkvAvEqcnNVFl9NKu9MCVxYs0JDtCgkkZJu6nz+dcdNllVLwlwUe6M2UeS+FdBH9azmZZYlV5ODZv12g7HIlMSIahWA0kjkkMw8i/NVjpFDug5cIh0xKLV0pDzqYEQa2M2O5kLRmSGm3DOHVePi1SL2LkTfO5LNiHOlnz0S+FYxIQAMA2Yiqr6ESZipWgfA877qN2roQlqMUCbFfg6B//S6HY5M5s8UpJjwMQq7+AmIEWfWOJ1a732uyWbTWSOkU4mLL3XoP4b82oLPxxIdSatbJvf24xrSX6WE0PtfKLo7k6GGTuCxdwPP//fV6H5qeIWtHtzXUP4RB6AhMY13ROFfpRzGpJnejEgDg0GbBZG/N/fosI1dXkWYWVJG0HGoOXVsZqXu4qzTIn5GWOQ7fhY1HFPmPKbZdsNQA+apfi72TqFJ9ttD4pFVf1ctnKd52qz70gf55d+ZsO+iqmuOHrKB1qeQk96PwUz7rRKF2sufqN9owsfcWtmOPxlOFOftxxS0bAJenEybARXxt9OC59I2X+zjC9Xetsa/h2CfDpgJyc3EsDtCYAdOG/EibtS/ZZmzuIqM1HyJaB5p4cHiUst9oXMQJwoXpDmPu6k2EjGE1rm1bdyI6Oh+Bip1K6Yf039F/SktEnGG2pJDCjqHa6gWz19Q7yx+QVUSk8aryjDBefvscMq1EORNjNRfT3oJptcWO17BynGy3fwBNjAr5zSKmZpD8iO7Mb6CNqcNuVe/oBbuNBKCVP4QikTxjzMFFUgbmCugtFFAF+dBsTTUze31xIqWqk98cQfLxjLPZwm45qzey6zI7mf6vSe5z9HJNQ4xWg3+sBnxpu1xw3GUmgklXU/PM8/zrGeBdodDs7C3lZLcIfMVnPmQvBsQD4dUKjNV8tZenEJbpXAd7onF74V7XwLugXLZvHpk7IMhCISASS7H0ht3cwdbF0Ladp3OFu5S5IyAvg1u4NPkhVfBRziRd0xyHbdmpHbdl8uuu+3KOAQgajFNbBPTUnJQ4PgcW0K2Y0LCqVhOIqOAX7ORzQ7fZEB6smhwfz5rf7HJNAF3Xlwf0zZg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ec687e03-a0a4-4be9-9e7e-08dc769e3826 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 May 2024 18:21:50.0423 (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: PAXP250MB0446 Subject: [FFmpeg-devel] [PATCH] avformat/flacdec: Reorder allocations to avoid leak on error 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: NwM4n1LCBgqN Fixes Coverity issue #1591795. Signed-off-by: Andreas Rheinhardt --- libavformat/flacdec.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c index 3d35da5fea..3c317acaee 100644 --- a/libavformat/flacdec.c +++ b/libavformat/flacdec.c @@ -283,12 +283,6 @@ static av_unused int64_t flac_read_timestamp(AVFormatContext *s, int stream_inde if (avio_seek(s->pb, *ppos, SEEK_SET) < 0) return AV_NOPTS_VALUE; - parser = av_parser_init(st->codecpar->codec_id); - if (!parser){ - return AV_NOPTS_VALUE; - } - parser->flags |= PARSER_FLAG_USE_CODEC_TS; - if (!flac->parser_dec) { flac->parser_dec = avcodec_alloc_context3(NULL); if (!flac->parser_dec) @@ -299,6 +293,11 @@ static av_unused int64_t flac_read_timestamp(AVFormatContext *s, int stream_inde return ret; } + parser = av_parser_init(st->codecpar->codec_id); + if (!parser) + return AV_NOPTS_VALUE; + parser->flags |= PARSER_FLAG_USE_CODEC_TS; + for (;;){ uint8_t *data; int size;