From patchwork Fri Apr 29 16:01:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 35509 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp377815pzb; Fri, 29 Apr 2022 09:01:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyL7zHgQOyA2crvVpWl6EkfuztcIyjO7LHnm3gxJDVgqD2e/PzNBf9P6CDd9aCPUobv0kyb X-Received: by 2002:aa7:cac5:0:b0:41c:c1fb:f5cc with SMTP id l5-20020aa7cac5000000b0041cc1fbf5ccmr40544362edt.219.1651248104601; Fri, 29 Apr 2022 09:01:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651248104; cv=none; d=google.com; s=arc-20160816; b=uLpvlEhkY6NpLm6wNBlVESatteCUuxSVEqvuS7e+EgPb7LzvaXB0taZ1pyFcMNc0SL IIBGDz3qDEIrNvbsFiajy+ZAD6RYHV0kbI+ikXAEzj2PzIlPZD3YZS4DZ7UDkb43itpb YDhdwuDnifJzL6nB7RPmb0V1IitUzfYFVeJk9jGixrnDycSGS2BuYoW7YP1sAz4LNUtN Uz5S94+vBgHf+Ys9KJ9J7RH59+W8elK+cbpO1E6hxIYQqM6JZJkgdsjECUVissUOwjgR 5MCbiqP4NcTVUdbV6iq8LVB2KD6KzXdINnYj2jv6AMXrOFCHf+KcMz986DOA30JRHyTN 0yhw== 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=r9ZoUXIIkyINfP/IKP9W+ZizTEdJTaFxNx8NrAMZj9s=; b=n5H1LbLQoMNFiZ4DwYkxQGoK2KKgOqXOuTXyDeAfvLueM3M1c1GUp/6d2tH7HpMpNs 8Hn479nqvLaTW1hEXTPvYZKlHYLvKngFZojbX4KJoG0qwIIsgDKcI6d7CBjMKTeEdVb3 74TVkUmTP+oiRiKMnO+1n48+rNk3yum2y9JLXYYpG784XyQ5uMu5sRPdMlSON6I2KdxR GPRsdkxkhVWQrCF4dGrFMOvwGimA3WIow66BYRyuJBbRF4sYO6rs3j3eqsewxL0HpOv2 Kf5GOrHxNBLcPgy8hZAqb4rXR5O/NNP/Vf6dxcn1jkTE6g7a91AOc3dhsVxAvQb9V8oF kV5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=eAljQ6xk; 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 m18-20020aa7c2d2000000b00425f1d7df1esi5844221edp.590.2022.04.29.09.01.42; Fri, 29 Apr 2022 09:01:44 -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=eAljQ6xk; 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 B430968B29A; Fri, 29 Apr 2022 19:01:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f46.google.com (mail-qv1-f46.google.com [209.85.219.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2F33468B252 for ; Fri, 29 Apr 2022 19:01:32 +0300 (EEST) Received: by mail-qv1-f46.google.com with SMTP id k12so5663383qvc.4 for ; Fri, 29 Apr 2022 09:01:31 -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=f5n8uKucxIXDfkSrcggdXKBUAdPUiVMfdNeawlglBBU=; b=eAljQ6xkdW5WAMWcPjN2uWT7t6WaDoSccPzrnbVmRbnaODvnU7pZX31F22iYVxdUnZ q3GOYrkcsft8gr54aqhA+7E1slPwUym6GsaxhSseFJNBwviAAnOHJHDkyVg1Yt6gjsE/ fC5KkbPmJpEOuLmZHO0pZYTXRr7sKBXyFnwB+jP0p1DwJac3EepbhP0ls4JrBIrCbx0E xCPvnvulTAwcKD70gcZbP+wuTZR3P7Ho6OpKBjzHq+olyxhVr1lk1Mdkv45a7NsGZByO CKeLc3f9qCqWtmkd9JQ5k8BCdzgP4gy4ztMBMcZG5XrLmgLHmRV8wZ7Qx5WEAkczYVPM orLg== 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=f5n8uKucxIXDfkSrcggdXKBUAdPUiVMfdNeawlglBBU=; b=f4INa+NAw4ytGHof++tjs/KPoO/OZLMIUOUisjyoCmkOLN0YVgabvjx9HeCuLGPMhh cLFl8nqv0YFwm96Nd+9zO9qtoSVgOfIiC8t0z7Isg4xYai6pjhqMZk/Y3rtN9ZgjV4m9 4t7C1EHd5daaHHJLQ3TqTloMF/DMmyfnqOnsSy7dUtMLbDsxybUKoNpzkmATQX/Cid62 REHhKyflzdUN3tkBpHfr5axyxnr8r3iIRPI0MgB4eDNHwaOYIdiJLpXz25SE0LuIMclN Ww+ydvPaQKpXRtrAD6+2Xf2wS6KNJrY06Vs2AMMxYose10PKdM8R4Dk3aJg7OgZwgiK9 eW8w== X-Gm-Message-State: AOAM533Cu28wWmcVjJ/KfW9BpF+GNGD9/ksWL746n3G63oRiQPkKwID9 coNhMdr6SS9rPv2W6Pcjo7pXntqqjc4= X-Received: by 2002:a05:6214:c2d:b0:456:3af7:5ce1 with SMTP id a13-20020a0562140c2d00b004563af75ce1mr17954793qvd.25.1651248090199; Fri, 29 Apr 2022 09:01:30 -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 de32-20020a05620a372000b0069fbfd12de1sm59605qkb.42.2022.04.29.09.01.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 09:01:29 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Apr 2022 12:01:25 -0400 Message-Id: <20220429160125.3265-1-leo.izen@gmail.com> X-Mailer: git-send-email 2.36.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] avformat/avio: use av_match_name to match protocol whitelist 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: 6X6eZRATLrm4 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 in accordance with the behavior described in the documentation. --- libavformat/avio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/avio.c b/libavformat/avio.c index 4846bbd8c6..1c033c6667 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -178,7 +178,7 @@ 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); }