From patchwork Wed Apr 20 20:33:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 35363 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1062277pzh; Wed, 20 Apr 2022 13:34:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwcqr+0iN/h14LrD86dpmvXiLhYub0kKuqXfE0WC2sa67xEBdKIvOyHqRZtHUwaRwwWrmH+ X-Received: by 2002:a05:6402:1717:b0:41d:8b43:fa51 with SMTP id y23-20020a056402171700b0041d8b43fa51mr25782899edu.21.1650486876057; Wed, 20 Apr 2022 13:34:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650486876; cv=none; d=google.com; s=arc-20160816; b=LYT8Z7orbXIkvDFVuTRw6kEf90U7BZKgsTVJ9Zw7Sxe7ngSwzjjupy0D8MWY/avTLI qTnGEoTlM87DyxT76WHjChAOPnqvNC9LXKfytjkHtewVV0MOFgX9+gR9cWnfEllyAIdN Mzn+kuZxHfjNUUpuy5VNHuka6ZzdvYFFZ5a6CYqEZ/HhGARAfa6/T89WKSOs3hTvYCa2 F2fJc9EUDCssqv4d6OOaOhYRgKBpxddnQNO8Ssyl41SKvOxyxCt1p3bwC28FSpuKjG6j sOzHKOf/lFWNXBJVQ3IrSlIv+OoCl7sfz1RVULAtovOJvXTMO5SFWihJ0OsCbv+mEc9A 46wQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=PGqrcpSYjQaM8W2AZQGsuC/WjKX/oDcvkcycBmY77Ng=; b=Kk1Fg5YPqb68I7gbLI+Chk4G/nIQYAXkHketUOJDvHxIGDDvUYKY68tylZgsGQbzmt 3nJVe0FYNeAWxJyEoUc/nE7Im8BP9OWx2W2c3AmhXD9CmWqOcx1B+NBfWlvYaQIEF6Hb IRtZT26DrQZClFyBwF3C0efUCh7UNdUCktf6ZH3bhhcDJElgm7waV3MiWcrEBNWtZkEc +44IiQ6RhGoK8u6bBoYhCmxEEjqm9DOWw3DBIZmL2pfrcemGr19Ueewxn4lO3Y6qmH7L Y4fss0umYPRfnepXCpzF6gQrtP9xg4p7Z6IHJf8/2BgQGFmbkctCjJb3yVvoIuIEy13I BmNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=jycSJRTm; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id kf24-20020a17090776d800b006efe2443277si2501360ejc.328.2022.04.20.13.34.12; Wed, 20 Apr 2022 13:34:36 -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=@gmail.com header.s=20210112 header.b=jycSJRTm; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A1A7368B453; Wed, 20 Apr 2022 23:34:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f182.google.com (mail-qk1-f182.google.com [209.85.222.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2A31568AE99 for ; Wed, 20 Apr 2022 23:34:00 +0300 (EEST) Received: by mail-qk1-f182.google.com with SMTP id e128so2143865qkd.7 for ; Wed, 20 Apr 2022 13:34:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ssi6tgaF51oS5odXhJPvoq5ebpGNrBCvbVYi+NZ9TpM=; b=jycSJRTmwiAmYoBTZpsLgd9nkwZotOfmUi9hq8DPFnPTP51soI/grb8JJ5p1gcUzH4 w4jZc525HI7p+DhnMHUkKC7cqRqXGoiWvrYx3OUCeiOYwAlrxCs1s+/E8miQTbVka+vb 7eIpxJx5a/WIW95jUFzjoqiVDEQ85b59I0wmtUUg6Qc2NiecDCW6sCV7g0KDxQdDQOMe VdpwXqHvL6cGjolRZSWHxzK5T0n7nJNg6LQo5VmF8jFHsiliWqdGCT91q1+yPfwBjckE JdLknFPmKVWdnSoAhOGwamZLohuXZwtTuz6/XvmUDxayzWh5UrbATH3gyRJkBVArtEdY n8LQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ssi6tgaF51oS5odXhJPvoq5ebpGNrBCvbVYi+NZ9TpM=; b=0mQ/JlefxPXipwiNLp1tjvVsH4PfCS5jgluLtJxQCkRQ1/pIx3g2wAly+cw9XccnHS +ue2dkjQJYBWcf+iX/C5eDcC8KkNwHoDMHmLaZ9Chly5FCrMHRMLp6LsubkEbYhMe42k CyZngCjsdLwZ/ytGf7s+ultQSIzTF/sDURREs7savSLpZZMHRJp2UTv22r//QvyiEe07 dkwWkLgb84Eqe7GcZY5+I1giD8+vCHWqXMpbt6M2ZEFeo7FOkwktQ2TStAhs9LBHlCp0 SzmJxuc3XtQ7vCBCKJ7FYanVqkCqzRwwBOMFiatNZV7D6vrWtKLDAtd912dVBI32Pp4T ucAQ== X-Gm-Message-State: AOAM533fT2vkobzGYoROccoA/IB0bNFX7aSWM6REbFxCVxjg0YHeq02t qkzVo12lROzFzP3woSuzsORWTrVRVaU= X-Received: by 2002:a05:620a:1724:b0:69e:883a:85b6 with SMTP id az36-20020a05620a172400b0069e883a85b6mr12253182qkb.247.1650486838762; Wed, 20 Apr 2022 13:33:58 -0700 (PDT) Received: from gauss.local (c-68-41-54-207.hsd1.mi.comcast.net. [68.41.54.207]) by smtp.gmail.com with ESMTPSA id m9-20020a05622a118900b002f1fc51135dsm2381042qtk.57.2022.04.20.13.33.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 13:33:58 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Wed, 20 Apr 2022 16:33:28 -0400 Message-Id: <20220420203328.67317-1-leo.izen@gmail.com> X-Mailer: git-send-email 2.36.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/avio: use av_match_name to match protocol lists 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: Leo Izen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 3od1wncsczWO This swaps av_match_list to av_match_name inside ffurl_connect, which allows ALL to be treated as a valid value on the whitelist or blacklist in accordance with the behavior described in the documentation. --- libavformat/avio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/avio.c b/libavformat/avio.c index 4846bbd8c6..d252bec2f3 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -178,12 +178,12 @@ int ffurl_connect(URLContext *uc, AVDictionary **options) av_assert0(!(e=av_dict_get(*options, "protocol_blacklist", NULL, 0)) || (uc->protocol_blacklist && !strcmp(uc->protocol_blacklist, e->value))); - if (uc->protocol_whitelist && av_match_list(uc->prot->name, uc->protocol_whitelist, ',') <= 0) { + if (uc->protocol_whitelist && av_match_name(uc->prot->name, uc->protocol_whitelist) <= 0) { av_log(uc, AV_LOG_ERROR, "Protocol '%s' not on whitelist '%s'!\n", uc->prot->name, uc->protocol_whitelist); return AVERROR(EINVAL); } - if (uc->protocol_blacklist && av_match_list(uc->prot->name, uc->protocol_blacklist, ',') > 0) { + if (uc->protocol_blacklist && av_match_name(uc->prot->name, uc->protocol_blacklist) > 0) { av_log(uc, AV_LOG_ERROR, "Protocol '%s' on blacklist '%s'!\n", uc->prot->name, uc->protocol_blacklist); return AVERROR(EINVAL); }