diff mbox series

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

Message ID 20220429160125.3265-1-leo.izen@gmail.com
State New
Headers show
Series [FFmpeg-devel,v2] avformat/avio: use av_match_name to match protocol whitelist | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_armv7_RPi4 success Make finished
andriy/make_fate_armv7_RPi4 success Make fate finished

Commit Message

Leo Izen April 29, 2022, 4:01 p.m. UTC 
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(-)

Comments

Leo Izen May 6, 2022, 11:55 a.m. UTC | #1 
On 4/29/22 12:01, Leo Izen wrote:
> 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.
> ---

Could someone please take a quick look at this?

Thanks,
- Leo Izen (thebombzen)
diff mbox series

Patch

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