[FFmpeg-devel] [PATCH v2] avformat/avio: use av_match_name to match protocol whitelist

Leo Izen leo.izen at gmail.com
Fri Apr 29 19:01:25 EEST 2022


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);
     }
-- 
2.36.0



More information about the ffmpeg-devel mailing list