From 7778d9f51bd1f4d086cafe95995406c3157afb89 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 21 Mar 2017 22:50:15 +0100 Subject: 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 Reviewed-by: Stephan Bergmann --- lingucomponent/source/languageguessing/simpleguesser.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lingucomponent') diff --git a/lingucomponent/source/languageguessing/simpleguesser.cxx b/lingucomponent/source/languageguessing/simpleguesser.cxx index 9fef4a402dbb..d5227edbdc01 100644 --- a/lingucomponent/source/languageguessing/simpleguesser.cxx +++ b/lingucomponent/source/languageguessing/simpleguesser.cxx @@ -61,7 +61,8 @@ static int startsAsciiCaseInsensitive(const std::string &s1, const std::string & min = s2.length(); for(i = 0; i < min && s2[i] && s1[i] && !ret; i++){ - ret = rtl::toAsciiUpperCase(s1[i]) - rtl::toAsciiUpperCase(s2[i]); + ret = rtl::toAsciiUpperCase(static_cast(s1[i])) + - rtl::toAsciiUpperCase(static_cast(s2[i])); if(s1[i] == '.' || s2[i] == '.') {ret = 0;} //. is a neutral character } return ret; -- cgit