[vlc-commits] live555: retain query while concealing credentials (fixes #15365)

[Rémi Denis-Courmont]

vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Aug 27 21:06:47 2015 +0300| [a4e44164665db05a55139623cb7834758703289c] | committer: Jean-Baptiste Kempf

live555: retain query while concealing credentials (fixes #15365)

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>
(cherry picked from commit 0e4ff2698dfa0144a25d162a562603fda08412fa)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=a4e44164665db05a55139623cb7834758703289c
---

 modules/access/live555.cpp |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/access/live555.cpp b/modules/access/live555.cpp
index e8ba5a2..fba3b88 100644
--- a/modules/access/live555.cpp
+++ b/modules/access/live555.cpp
@@ -319,7 +319,7 @@ static int  Open ( vlc_object_t *p_this )
     p_sys->f_seek_request = -1;
 
     /* parse URL for rtsp://[user:[passwd]@]serverip:port/options */
-    vlc_UrlParse( &p_sys->url, p_sys->psz_path, 0 );
+    vlc_UrlParse( &p_sys->url, p_sys->psz_path, '?' );
 
     if( ( p_sys->scheduler = BasicTaskScheduler::createNew() ) == NULL )
     {
@@ -561,10 +561,12 @@ static int Connect( demux_t *p_demux )
         /* Create the URL by stripping away the username/password part */
         if( p_sys->url.i_port == 0 )
             p_sys->url.i_port = 554;
-        if( asprintf( &psz_url, "rtsp://%s:%d%s",
+        if( asprintf( &psz_url, "rtsp://%s:%d%s%s%s",
                       strempty( p_sys->url.psz_host ),
                       p_sys->url.i_port,
-                      strempty( p_sys->url.psz_path ) ) == -1 )
+                      strempty( p_sys->url.psz_path ),
+                      p_sys->url.psz_option ? "?" : "",
+                      strempty(p_sys->url.psz_option) ) == -1 )
             return VLC_ENOMEM;
 
         psz_user = strdup( strempty( p_sys->url.psz_username ) );