From patchwork Thu Sep 7 10:38:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43632 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b17:b0:149:dfde:5c0a with SMTP id l23csp506112pzh; Thu, 7 Sep 2023 03:37:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF2UI4zbmcsUAe/t5OiOgMrmAOjxxqLQBOTIbMS/hmfsgPi2DXgECMWuvqfBgo7dfZv3PR0 X-Received: by 2002:a17:906:318c:b0:992:3897:1985 with SMTP id 12-20020a170906318c00b0099238971985mr4691085ejy.43.1694083068717; Thu, 07 Sep 2023 03:37:48 -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 p23-20020a17090635d700b0099d969e2d30si11032311ejb.192.2023.09.07.03.37.46; Thu, 07 Sep 2023 03:37:48 -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=b7YNizrT; 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 16FD668C717; Thu, 7 Sep 2023 13:37:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2063.outbound.protection.outlook.com [40.92.58.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E182068C717 for ; Thu, 7 Sep 2023 13:37:35 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cHhlfP4XCOUuA2zG955eSzEAUK5NMAvXU7AheeY4Bja9O2Q/t2u8EiYFPf/5Rcywj4Wpv4xcL8S3V17uq2mcedtNrhfLeIenvD3bd9mOfFV9TgbeBocB36/02/x/N+W5yaxDPajTPzgKJDGi4mQxEIPF1LdJ4dwhQS7DNdEFeuDZJCFJ8OK6rr+LitpUAfv/xdVH3Avwh4GaRxjs3VidG5KtlwlwvmNOUQUBsIlGRb6Mc9OE5Ip8Koa3E/ZueBGoI22RQqb6tQQqFuau62wOXLNFxLv+XLHr91i2DL+oeO5+XWCvhvqivi5RTFNrrQyQaEkzd0/7uSt926T4kW2TOw== 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=yJXk2zih0KVz0C47QJ5lXjqCn7cUYx5a67actKHfMbg=; b=iQyWBmds6GbWerWHD2X9qvTY+cNkr3WDcwIfnQWaW8r1e+PvBW6DXwUh01bKuyNwm4tH3i8QMUG3ovP9kKmMrp6AKTBUAlLfX8R0KbyZDEUGuZLydazT+TqhW7j7q4xtnhC0Dr6uwXsMibhRZ9/wp9lrV9O7zHeJjioIX730PdVdt8M+X6wtIKAkkV7bwXDhsNxCOqdtb/ANfp9ubX2zkXZvGulFenoiZq8/C7+Ga04sZKw9/kcD2MFeiNvBaG7VEX1k7naUiBGsQ+ltqLxOamjVdlOXnEAG384c7tOqDLnLFIhBLdHrbcixuAlk7eK7Hbv2S7ir/0nRz5EdjMX26w== 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=yJXk2zih0KVz0C47QJ5lXjqCn7cUYx5a67actKHfMbg=; b=b7YNizrTHdEkhKY7mHJNVRTvq7jnqTkWXLrxFGqDjlYocdr+nX90CLOgXdSYizRtfgKgPT2O+LzlnzKGtuVPmC2T1dX8vzJJDa0BLNEwgjoVVllXcqgi69YkmtrigjZxPiAVnV1DNcZD/cxYiPSRrNjcpT2KymQVh5LbcdFRzk4YL0L/ULyBZeGWnSJjR9+pzZsperEYLXHHEw3xne+Oy2uPT3v8lC5vS/IjRLhnSmRUmNccLhRYC0eCmE0Axa7fpRKYKIloCIz1z8LKtgkbEU9LvY24u7nv16IR8aPMuq5201xkLcpCMNJIJiqKaUCUrvEbqIWsnmBlE2V1S6mjAQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0191.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:277::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.34; Thu, 7 Sep 2023 10:37:34 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6745.034; Thu, 7 Sep 2023 10:37:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Sep 2023 12:38:41 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [XgxY2oiGmsVurU8Ag6H8iXC7aVK6AXQL] X-ClientProxiedBy: VI1PR06CA0127.eurprd06.prod.outlook.com (2603:10a6:803:a0::20) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230907103844.673303-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0191:EE_ X-MS-Office365-Filtering-Correlation-Id: 9d3be7d1-e730-4785-f2bb-08dbaf8e721a X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Hx8Zr3WznUVJcusM8AijyERDIlscyovzX2r9AKcFL4nKejXU2PKs58GyzVXRK1+YJoQefnLD2OTYLiuBwVptzkKTyhSumC4dus5pA/38MgXzqlaGU/sZPitbtrrP0DkhKlsrS1pqyOR4shqBxSulRYTEnKnvtMy83UTQwAk6t2J21g5x6XZ4odwjkjRXuHzot//ceaCAr8gf0wiDNV1bUZl3eJOCMpL9Zip+zaZPjQNJwUKxusO5Gs1BVDF3Df1EFtPAykgCNMoJ+jDAiEaebWuTRtLT/sdZyUwGTDgaZXFqdm3WCwdI66eYhXAJetJQ+LXTk/sRMRmpa8RGOj1t36FCH4ihrdfdHHI6t6sL9FVQ7sQRzgTx3pd/ZneBzUcR5pnIPIA3gFqjubpgT7u17/3YweO7RkmQYvaMEfmyn2QwbVRpuhwpQymYfNgWi71P/CTXcwORfzwQ3ZUdL8sfMgs01xX6fS2btxSFrEVCt+bCmyCXdAQ0PkVHu3luMoCdxv6GDPoqaGg80xjf20wA4/EyZIU/eVZB9qdZQkJzy9/Qwy67NqIToj4zTaRmt8gAOE8kVhWSakehQQzthOYV5vu6KVO0gruk0JkXSE1PnLvZ4HpGNAv+cqwsBjuSuwfF X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xV3uSG8ZIUj3SSOqQsD3Po437XchdtJoecarAvn6lJCFAjRaxF/enS0wq139bUvEVOOFTcm9F8k3BKpvaFj7un8eySHyNevTOSKNU1WL4ORRK7cWFj7qv817iWkZpViZyhXnp0yNWwTX7m5FfvqNk65sVPypZKaz0S4ccwtaJCMUvX23Aa75yAYtgOdo1VTrvgV5Tto0pFyemFFoXal1Hmoihu4bwd1s1wU5CfTxYIepYoXgOIIFUFXMrCWPmQn96JcBo9b2eKwky/JTCzXKJKDeRPB9bNKbGYVpChVSFD19/ka8xLSm/nyumbnujvoJ90dTlJhlBRwlGhW3phSxe6fzwkjb+lsDWdvFELQgeuChnZjR9MBi/JuiBJXTfG3XFOnCluVPfaVA/H4SZP+uBf4/PkKxuoOgAyAIbtvn0vpSCLXpy57n+YLuFOawGBqiuZuDpUOR8YJ7/rH0ATg26s6JbYtmmB8xjGGpmu84xbf78gRsBJgMBLG3uUiTRMltOi+xZ9mRVgv6AbKc1F9D/6GG9lE+nAtvya7zXlvdcjSG5zqGUcOvNP1bVq170PTt2ODIZluUu9/yeHzxzVavUNQSx7QbQ3RikFPLAgXFJdkQrbSDDyNqtIYMqClGYNw3qWsVpUjFaMTQA/VGCChOwkRK9Vl5J36qBOsB3sn1ytRl1uKPcWGNLUThGzfX7z1OV2pOAWzFOynuN1tjjSqRiLmqZDSn1hmezGTLtrAheb0zgzZpLAyQejtKJoLC78QPybzxnQfW1yaVZlvnTbXKJBvqcvDIFHN69QqPd7FsTwZ+MKSK0PfMtBMUgJYAJX+0bOmVP+IO0+RJCwopxlSnGiSID83xWTFJ/pmfxd1Uxq5zL5RvX5upMkWum7DlBlB8bJbddnC1heNY/W9XO0I3uFWZ4ZnoyJO/7GmH1BtE143eb9eh8D7I/7Z43xIeNWKzFp/xOAUPhbNZTc5S7IQbxS/Q0ftI8RvHxb2NzZVNpJ/zPFy1wZU8rk62Fz2KuHV/8vA9mVyYYnpn+yC0dTsWpH48kPAyjB0rGZ3s3zI+vXhHF8/EvNTId4bEN01JA7sop9+IEPM6fg/lsofjbKNheuGdx4+dgoZppP2XF6YQjFhKpf/5QxRDm68dzmgelECJ9OCU0Y+a6yfCJ9/k2kv13xOLj2PDD8kUId82pZPu5/i5UYF0VS4TFcoLBU5a8u1hV0CDrBTve7K2ybh61VYZY7ss2r3McCw9NyLe49DwWcbxzLeGftvKQ1kOyTH796BZ X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9d3be7d1-e730-4785-f2bb-08dbaf8e721a X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2023 10:37:34.0854 (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: DU2P250MB0191 Subject: [FFmpeg-devel] [PATCH 23/26] avformat/avio: Remove duplicated freeing code 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: 2QHvqM7vLdkw The target of the jump frees this stuff, too. Signed-off-by: Andreas Rheinhardt --- libavformat/avio.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavformat/avio.c b/libavformat/avio.c index 053cb2e05a..a4572d2f05 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -136,8 +136,6 @@ static int url_alloc_for_protocol(URLContext **puc, const URLProtocol *up, } if(ret<0 || p!=key){ av_log(uc, AV_LOG_ERROR, "Error parsing options string %s\n", start); - av_freep(&uc->priv_data); - av_freep(&uc); err = AVERROR(EINVAL); goto fail; }