From patchwork Sat Mar 2 19:51:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46711 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp2009461pzb; Sat, 2 Mar 2024 11:50:36 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWevE4IbXGTY1VkR9QpguvjE5Q6L0/QuaLfpjYzh4Lh3HfEhgkh9AMbhPOc4Tu4gK/Pa1GtqBkTKHge7CyxiwA9uRkRw+4FlR2oUQ== X-Google-Smtp-Source: AGHT+IH9YJAEHHCTxU2jkVGNotVkT/TediODw7ZLdh6n4lrrNdxB1uXfeesc9n+xaw6Mj8Y4cy1R X-Received: by 2002:a05:6512:2829:b0:513:3d25:d2f0 with SMTP id cf41-20020a056512282900b005133d25d2f0mr1084276lfb.1.1709409036000; Sat, 02 Mar 2024 11:50:36 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f19-20020a170906c09300b00a3f851fc3f3si2509195ejz.504.2024.03.02.11.50.35; Sat, 02 Mar 2024 11:50:35 -0800 (PST) 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=MmuieRYV; 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 ACB5568CD00; Sat, 2 Mar 2024 21:50:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01olkn2072.outbound.protection.outlook.com [40.92.65.72]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1576568D30B for ; Sat, 2 Mar 2024 21:50:20 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Yhg/3zne402UbgyVWbwmmdWgqPuqvTl/+2i2EMOrR1mDXA6FXKju6AnMUW6z2wZcXjipnuWcckEYx4FLLKayCxJaS7BviWuiEi/5WfrrBB2+wh9VChKJSlLxYE+7j9VHnkUgdID3+2bwoGACBVUALHGT/as7DZENBKXoFJVbBCkS3PEW2AC8PLZX55066EyGfajNhxaWW8qlgh297HAf5ksZesMsyfPLiMbYGQRLYBEztk1Nv2pC3j1AjuGWX85XAIP4gYBc8AVqyCImJgFu1gqd5aW/9hns20ATGusNUiHXB22GETFdeMfeX32otkiG1h950/hcRt3q1ckZIG+JNg== 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=U4WBhWu/CaVOJP6YFu90rNyM3aGUq9XiqbeM6hguXg8=; b=DWgc6ic0j3Qtp0VP8ZoDkaCepICfrcBuOrSD8VRPQC6bAULdDaDa+6KnFGn04k8Q1JjRSaLr8Ce3BJGgq35qKUhps5Fglf3PCurv4GB9H9vdvHAy3bytXlfr/1jjZW84tRUxcx0QeFWpW1g9t/H1ToL6W42eje3cf4eZDCQ8Nug1RcCtn7U5mUXD0+hxU8Tpx9hOzlojx7B+cmOyzD9NrTV0vD7ozSnxo9bFqBx7Be4cq56Ft+CQOGPZAYNrq3wUzd5zdezVDGJdS0o2TWxaEuKP6cs84sMXJc3EBgN0knGOOWXbsWHgE3cI6LF2IV79zUVVMJxNdQzFdQcoq8DthQ== 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=U4WBhWu/CaVOJP6YFu90rNyM3aGUq9XiqbeM6hguXg8=; b=MmuieRYV4Yf+7Fuun1toSXs/MU23yGro+fYUNt8b5EM5UlOdwt5ioy1HUY7j27YqRR1qqUcvqVwYvA1k0vnMfWjVamoMzGbAHmveN+FGwJEXxv3Jc2QYMXAei2g+IH6w36G+x5GxCabhwKqSuR9Xiy29+4Ur3LlFG4Nn9DcFqxMgvNZHQboE6N3cUO/JfJYdeJi6GI4szz6F1Xxpm8fKUB+vykUu71AQS9VDodCdL9JTKCMX6DBzxzUS19krslgu4Z5O5G/jQkoOCU8bf6a0yXtzKQSrGcTWEsGrsRDom8Oo4ISZ+q4+5Q8dHp8GbuZku6hxnbc/VxiXSeegOyQNFQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0045.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:2b6::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.32; Sat, 2 Mar 2024 19:50:10 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7316.023; Sat, 2 Mar 2024 19:50:10 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 2 Mar 2024 20:51:59 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [FZdZrNwZSEZpIY5QUmAybGJhjLPKbzJg] X-ClientProxiedBy: FR4P281CA0079.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:cd::9) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240302195159.70943-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0045:EE_ X-MS-Office365-Filtering-Correlation-Id: 3b543242-b298-44f1-9b0f-08dc3af1f7da X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yBuflFZOfFdg4XpzqvqQs36gmQOg+SkFiAyzwvtOBXPqAfTmMKGMxxOK/iM1p977lc2y5AHGl0iDTUKsqSp0LXvIeVS8ZLkkSc0VJtk6/UsjtojDce4iCGGJxbsFUovwWWfJ+TqNaIjIT5ov87crFs8p+Q7enideMC85BkX4/4kC7DkpCqk5NkI8TB8VqH/GDpWT42euzd0zY+EJvX22jeFXQugono4YUARHHw4wsu7KVg4+CnXuyVzFKk+UPJ0R8qt9JmVov5mTTWW31F+N0zrrUlDW+gyAZElsrrKxi73NryUDajGVnDKaWtk9YH8EDXsyrnZynXbiSi6ILlnR4s3n0flqptlMbInOnDkABRL58Jb/2nnVixD4hYbOHbZ0SdD6yd3cxGwpZDND6cbH/rfixT6InK+TlrVOr9kCWh1X4GR2pnyHRjS2GtRq9nOvXTa4Tlwy7jYk6AHepvxxVRBw4Z4RsihTl31q9WuOmqD7pHMTtE0rm06XLxBAyRc7nf53hWM3IDtRZTtJ352n0n78YiyhIfVy520B8Lzd/jzUg20k/BLJJPgcGOvafVeDYbJkPGo7nzK+QWUTqIY3Cu1Y/9wyS/kGhIT9proj3IkduFRGttB6rhOOSoILFGEE X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WFywlyBsY2f+nlC/cwYZuA0/ODFgV1HBn3LZn6yZDuYbUhk7rumAOqVbtzs7Ta9ce+mltizGDpbArekDGQ9N/rD2Iu2TPcal/CXvCrF4ZXNzqJpdp/va9mek/OU0VZkvoJpJZlG87hOnLFnftrbbv0qpCN3mqkVVSk2usT9tSKdi0Z1RvJqhtuJL+1eTbYHf/zYkvSKWvU3NURS35wekDAFnD3UnbrKP2VHLDwc8X+IglBk2e/UrxrwsUROGjAQEH+uCLj9j/llR+VUFMBa639JARpnymqSi3YiN/5HPMObGGQhFhFjBfapwqSv3PI/DAiHYbpHA7dMRL7RQMBNFrjYdpqal/gwRpB40xaY2pKZkeB+3abV83g84hzQRx8/U9F9Qe6T2BP1hUhhwHypv1dgekvjlbAqEPBGpmOVCaSmO15qlGSdkuxUCbUS/ztmIOUAGWM6TnjxjMG0wxKp1Ox4Po3IlJprdsQkS6OE3cspHzebVi5T4BrvNf/FN2f3NUWH0HMR8/7c/hARrhy3QICaopuZyzJDkS9qYVqWWrKqRw9l4Cco8jsz675kkMmNFTvdvjGcLbM/DJNaPEePhZkUQ2SjYQYhC8mSV0uR/iey5yKXoG2Leq8YWBKti5DlIyZAkE8gtiV/2bKdgh3KivRn2vbuJUeHNt8iBSmrChOOshQxv6hIJpxgVZwgAsdPfvbuZvtUICNMtSzQ4sweWYesGfIk7l8p0CmBEYWndpCagahYjJLpgQdAogTSgawKKNXyiUgZwhXjWS5S0kNQqzAJXkJ4HJ9+yDLDPsaxZu95xeUsuyPgb66wZS5ND3emGMDKECWMdk2xqTtqXXpe4dso4kIyng/JKEu3Y948QbH9AZY4zvUB65U3eHTcGu1HdHNIPf7O2c77GtfpPK5UGcFnl7ijWJrLWkiSe8uUOKHeoPpAAdXU1qOvj20mlIHdLfXre+EGdWZnOq+2M8hlSbYOBXhvhgn3IPG4y/WMQk3mvoCaJW80vU8vkukfKUdNEP4SOmbkzjoXGZqmzFPoj+X+O9fFz/Vj5IljlHtsQzikiFbLZ0zAvpUxY3L9Eq7IdJhu6F/PDnzIEiwzU2uV2FT5iYrYRv55/tk1YD+uZD4e4gh1jnIr0at0VqVAfvBH6E8jKJIf3L/aBCb3stgnd4nwg3HQBrLKfcMwOwEZR/vIEzdaLMRS99m+WXlGj4gRyqQSpWp4P8fcgXNKPxdMSRRdJHWCAGr+ARYdQEDMNazLhp1BgWTqXWIkvlu6WayKR83loEXU29apsB8pxJsud5g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3b543242-b298-44f1-9b0f-08dc3af1f7da X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Mar 2024 19:50:10.1464 (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: DU2P250MB0045 Subject: [FFmpeg-devel] [PATCH 4/4] avformat/avio: Avoid av_strdup(NULL) 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: 8bBsuQKZSruk Signed-off-by: Andreas Rheinhardt --- libavformat/avio.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/libavformat/avio.c b/libavformat/avio.c index f3d10fac39..5186c2b464 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -436,15 +436,19 @@ int ffio_fdopen(AVIOContext **sp, URLContext *h) return AVERROR(ENOMEM); } s = *sp; - s->protocol_whitelist = av_strdup(h->protocol_whitelist); - if (!s->protocol_whitelist && h->protocol_whitelist) { - avio_closep(sp); - return AVERROR(ENOMEM); + if (h->protocol_whitelist) { + s->protocol_whitelist = av_strdup(h->protocol_whitelist); + if (!s->protocol_whitelist) { + avio_closep(sp); + return AVERROR(ENOMEM); + } } - s->protocol_blacklist = av_strdup(h->protocol_blacklist); - if (!s->protocol_blacklist && h->protocol_blacklist) { - avio_closep(sp); - return AVERROR(ENOMEM); + if (h->protocol_blacklist) { + s->protocol_blacklist = av_strdup(h->protocol_blacklist); + if (!s->protocol_blacklist) { + avio_closep(sp); + return AVERROR(ENOMEM); + } } s->direct = h->flags & AVIO_FLAG_DIRECT;