summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-04 08:39:35 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-04 09:19:59 +0000
commitd3248d1fd83cca67a11dd593c124694382bf5f34 (patch)
tree22abbb7e2cb96222d6bead9db0fda86b39589508 /sal
parente8a5e8023d8c3adcd0d91160a82f093e76b85030 (diff)
Handle URLs with query or fragment (or containing NUL chars)
Change-Id: Ib6ba723b59fb5af69b45456a19e1bff085a75c92 Reviewed-on: https://gerrit.libreoffice.org/19775 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sal')
-rw-r--r--sal/osl/w32/file_url.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/sal/osl/w32/file_url.cxx b/sal/osl/w32/file_url.cxx
index edb9b9a68cf6..dda005b0044c 100644
--- a/sal/osl/w32/file_url.cxx
+++ b/sal/osl/w32/file_url.cxx
@@ -593,6 +593,11 @@ static sal_Bool _osl_decodeURL( rtl_String* strUTF8, rtl_uString** pstrDecodedUR
*pDest++ = aChar;
}
break;
+ case '\0':
+ case '#':
+ case '?':
+ bValidEncoded = sal_False;
+ break;
default:
*pDest++ = *pSrc++;
break;