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 /helpcompiler | |
| 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 'helpcompiler')
| -rw-r--r-- | helpcompiler/inc/HelpCompiler.hxx | 3 | ||||
| -rw-r--r-- | helpcompiler/source/HelpCompiler.cxx | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/helpcompiler/inc/HelpCompiler.hxx b/helpcompiler/inc/HelpCompiler.hxx index 0e4975424d9d..b888ce7512c6 100644 --- a/helpcompiler/inc/HelpCompiler.hxx +++ b/helpcompiler/inc/HelpCompiler.hxx @@ -238,7 +238,8 @@ private: inline char tocharlower(char c) { - return static_cast<char>(rtl::toAsciiLowerCase(c)); + return static_cast<char>( + rtl::toAsciiLowerCase(static_cast<unsigned char>(c))); } #endif diff --git a/helpcompiler/source/HelpCompiler.cxx b/helpcompiler/source/HelpCompiler.cxx index e456f5acd5b5..50a215db7527 100644 --- a/helpcompiler/source/HelpCompiler.cxx +++ b/helpcompiler/source/HelpCompiler.cxx @@ -460,7 +460,7 @@ bool HelpCompiler::compile() std::string appl = module.substr(1); for (char & i : appl) { - i=rtl::toAsciiUpperCase(i); + i=rtl::toAsciiUpperCase(static_cast<unsigned char>(i)); } xmlNodePtr docResolved = clone(xmlDocGetRootElement(docResolvedOrg), appl); myparser aparser(documentId, fileName, title); |