[vlc-commits] demux: adaptive: fixup AnyURI

[Francois Cartegnie]

vlc/vlc-3.0 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed May 20 17:02:53 2020 +0200| [0d74c2d2af2e0caf7991b646b15b48ae29645308] | committer: Francois Cartegnie

demux: adaptive: fixup AnyURI

(cherry picked from commit 6b2e2ee875332ba3a33eaf88a7837642f9695d16)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=0d74c2d2af2e0caf7991b646b15b48ae29645308
---

 modules/demux/adaptive/playlist/Url.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/demux/adaptive/playlist/Url.cpp b/modules/demux/adaptive/playlist/Url.cpp
index bd20701e37..86385b1afe 100644
--- a/modules/demux/adaptive/playlist/Url.cpp
+++ b/modules/demux/adaptive/playlist/Url.cpp
@@ -125,7 +125,10 @@ std::string Url::toString(size_t index, const BaseRepresentation *rep) const
             ret = part;
         else
         {
-            char *psz_resolved = vlc_uri_resolve( ret.c_str(), part.c_str() );
+            char *psz_fixup = vlc_uri_fixup( part.c_str() );
+            char *psz_resolved = vlc_uri_resolve( ret.c_str(),
+                                                  psz_fixup ? psz_fixup : part.c_str() );
+            free(psz_fixup);
             if( psz_resolved )
             {
                 ret = std::string( psz_resolved );