diff options
author | Luboš Luňák <l.lunak@collabora.com> | 2021-04-22 22:07:48 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2021-04-23 08:15:09 +0200 |
commit | b345c5b489a8b270dfa767d2bb773232540a7fe6 (patch) | |
tree | ac71c24f11d89b602d04900583bf996e178368e7 /ucb | |
parent | 8dcf0e0ccdd17d1c1b650e43944cb1e706920edd (diff) |
handle properly missing URI components for webdav/serf
Username is not mandatory for http://, and files require only path.
Change-Id: Iab4e81692b288d17dd8a35954e34a1bbe7c943ef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114526
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
(cherry picked from commit 8313e7fe55d4ad147df0b5b1f9f94c6882197132)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114503
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'ucb')
-rw-r--r-- | ucb/source/ucp/webdav/SerfUri.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ucb/source/ucp/webdav/SerfUri.cxx b/ucb/source/ucp/webdav/SerfUri.cxx index dab11a64cfa9..ac87848c0878 100644 --- a/ucb/source/ucp/webdav/SerfUri.cxx +++ b/ucb/source/ucp/webdav/SerfUri.cxx @@ -90,9 +90,9 @@ SerfUri::SerfUri( const OUString & inUri ) void SerfUri::init( const apr_uri_t * pUri ) { - mScheme = OStringToOUString( pUri->scheme, RTL_TEXTENCODING_UTF8 ); - mUserInfo = OStringToOUString( pUri->user, RTL_TEXTENCODING_UTF8 ); - mHostName = OStringToOUString( pUri->hostname, RTL_TEXTENCODING_UTF8 ); + mScheme = pUri->scheme ? OStringToOUString( pUri->scheme, RTL_TEXTENCODING_UTF8 ) : ""; + mUserInfo = pUri->user ? OStringToOUString( pUri->user, RTL_TEXTENCODING_UTF8 ) : ""; + mHostName = pUri->hostname ? OStringToOUString( pUri->hostname, RTL_TEXTENCODING_UTF8 ) : ""; mPort = pUri->port; mPath = OStringToOUString( pUri->path, RTL_TEXTENCODING_UTF8 ); |