avformat: add Changelog entry for librist and bump minor

[ffmpeg] / libavformat / url.c

diff --git a/libavformat/url.c b/libavformat/url.c
index 3c858f0257c8c83234383e8e2f21eb7b7b702bac..77d610d95f576ea1be893e987c8d7bee979552b9 100644 (file)
--- a/libavformat/url.c
+++ b/libavformat/url.c
@@ -97,7 +97,7 @@ int ff_url_decompose(URLComponents *uc, const char *url, const char *end)
 
     /* scheme */
     uc->scheme = cur;
-    p = find_delim(":/", cur, end); /* lavf "schemes" can contain options */
+    p = find_delim(":/?#", cur, end); /* lavf "schemes" can contain options but not some RFC 3986 delimiters */
     if (*p == ':')
         cur = p + 1;
 
@@ -211,8 +211,8 @@ int ff_make_absolute_url(char *buf, int size, const char *base,
 
     if (!base)
         base = "";
-    if ((ret = ff_url_decompose(&ub, base, NULL) < 0) ||
-        (ret = ff_url_decompose(&uc, rel,  NULL) < 0))
+    if ((ret = ff_url_decompose(&ub, base, NULL)) < 0 ||
+        (ret = ff_url_decompose(&uc, rel,  NULL)) < 0)
         goto error;
 
     keep = ub.url;