vlc | branch: master | Rémi Denis-Courmont <r...@remlab.net> | Thu Aug 27 21:06:47 2015 +0300| [0e4ff2698dfa0144a25d162a562603fda08412fa] | committer: Rémi Denis-Courmont
live555: retain query while concealing credentials (fixes #15365) Signed-off-by: Rémi Denis-Courmont <r...@remlab.net> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0e4ff2698dfa0144a25d162a562603fda08412fa --- 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 3bdd741..8d40dc7 100644 --- a/modules/access/live555.cpp +++ b/modules/access/live555.cpp @@ -314,7 +314,7 @@ static int Open ( vlc_object_t *p_this ) vlc_mutex_init(&p_sys->timeout_mutex); /* 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 ) { @@ -570,10 +570,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 ) ); _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits