diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-03-21 22:50:15 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-03-22 09:00:57 +0000 |
commit | 7778d9f51bd1f4d086cafe95995406c3157afb89 (patch) | |
tree | 9a43660947b78d9f714c45e1be48ef46dd0d082e /soltools | |
parent | 02bccbe0d59e50a7fd987c81c4d15b2fd4d24538 (diff) |
Prevent calls to rtl/character.hxx functions with (signed) char arguments
...that would implicitly be sign extended (for plain char only if it is signed),
so non-ASCII char values would trigger the isUnicodeCodePoint assert.
Change-Id: Iaf8024ad509e64525558e882fe3fd078cfb4ea91
Reviewed-on: https://gerrit.libreoffice.org/35523
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'soltools')
-rw-r--r-- | soltools/mkdepend/collectdircontent.cxx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/soltools/mkdepend/collectdircontent.cxx b/soltools/mkdepend/collectdircontent.cxx index c001ee05042c..3aa4981055fb 100644 --- a/soltools/mkdepend/collectdircontent.cxx +++ b/soltools/mkdepend/collectdircontent.cxx @@ -30,7 +30,11 @@ void IncludesCollection::add_to_collection(const string& dirPath) { } do { string winFileName(FindFileData.cFileName); - transform(winFileName.begin(), winFileName.end(), winFileName.begin(), rtl::toAsciiLowerCase); + transform( + winFileName.begin(), winFileName.end(), winFileName.begin(), + [](char c) { + return rtl::toAsciiLowerCase(static_cast<unsigned char>(c)); + }); dirContent.insert(winFileName); } while (FindNextFile(hFind, &FindFileData)); #else @@ -52,7 +56,11 @@ void IncludesCollection::add_to_collection(const string& dirPath) { bool IncludesCollection::exists(string filePath) { #if defined(_WIN32) - transform(filePath.begin(), filePath.end(), filePath.begin(), rtl::toAsciiLowerCase); + transform( + filePath.begin(), filePath.end(), filePath.begin(), + [](char c) { + return rtl::toAsciiLowerCase(static_cast<unsigned char>(c)); + }); #endif // defined( WNT ) PathFilePair dirFile = split_path(filePath); string dirPath = dirFile.first; |