vlc/vlc-3.0 | branch: master | Simon Latapie <[email protected]> | Mon Mar 25 19:36:42 2019 +0100| [bffeddebcb42c85106d509048a96750fbfb49e54] | committer: Hugo Beauzée-Luyssen
access: vnc: fix URI parsing In 3.0 branch, demux_t does not contain psz_url (manually cherry-picked from 15b9c1be6551fa7674a019c165fc219fabcd90fd) Signed-off-by: Hugo Beauzée-Luyssen <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=bffeddebcb42c85106d509048a96750fbfb49e54 --- modules/access/vnc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/access/vnc.c b/modules/access/vnc.c index 3cd4ab642b..1d067c584c 100644 --- a/modules/access/vnc.c +++ b/modules/access/vnc.c @@ -439,7 +439,11 @@ static int Open( vlc_object_t *p_this ) /* Parse uri params */ vlc_url_t url; - vlc_UrlParse( &url, p_demux->psz_location ); + char *psz_url; + if ( asprintf( &psz_url, "%s://%s", p_demux->psz_access, p_demux->psz_location ) == -1 ) + return VLC_ENOMEM; + vlc_UrlParse( &url, psz_url ); + free(psz_url); if ( !EMPTY_STR(url.psz_host) ) p_sys->p_client->serverHost = strdup( url.psz_host ); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
