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 /tools/source/ref | |
| 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 'tools/source/ref')
| -rw-r--r-- | tools/source/ref/globname.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/source/ref/globname.cxx b/tools/source/ref/globname.cxx index 67bbf7e153be..d6395b79a33a 100644 --- a/tools/source/ref/globname.cxx +++ b/tools/source/ref/globname.cxx @@ -188,7 +188,7 @@ bool SvGlobalName::MakeId( const OUString & rIdStr ) if( isdigit( *pStr ) ) nFirst = nFirst * 16 + (*pStr - '0'); else - nFirst = nFirst * 16 + (rtl::toAsciiUpperCase( *pStr ) - 'A' + 10 ); + nFirst = nFirst * 16 + (rtl::toAsciiUpperCase( static_cast<unsigned char>(*pStr) ) - 'A' + 10 ); else return false; pStr++; @@ -202,7 +202,7 @@ bool SvGlobalName::MakeId( const OUString & rIdStr ) if( isdigit( *pStr ) ) nSec = nSec * 16 + (*pStr - '0'); else - nSec = nSec * 16 + (sal_uInt16)(rtl::toAsciiUpperCase( *pStr ) - 'A' + 10 ); + nSec = nSec * 16 + (sal_uInt16)(rtl::toAsciiUpperCase( static_cast<unsigned char>(*pStr) ) - 'A' + 10 ); else return false; pStr++; @@ -216,7 +216,7 @@ bool SvGlobalName::MakeId( const OUString & rIdStr ) if( isdigit( *pStr ) ) nThird = nThird * 16 + (*pStr - '0'); else - nThird = nThird * 16 + (sal_uInt16)(rtl::toAsciiUpperCase( *pStr ) - 'A' + 10 ); + nThird = nThird * 16 + (sal_uInt16)(rtl::toAsciiUpperCase( static_cast<unsigned char>(*pStr) ) - 'A' + 10 ); else return false; pStr++; @@ -231,7 +231,7 @@ bool SvGlobalName::MakeId( const OUString & rIdStr ) if( isdigit( *pStr ) ) szRemain[i/2] = szRemain[i/2] * 16 + (*pStr - '0'); else - szRemain[i/2] = szRemain[i/2] * 16 + (sal_Int8)(rtl::toAsciiUpperCase( *pStr ) - 'A' + 10 ); + szRemain[i/2] = szRemain[i/2] * 16 + (sal_Int8)(rtl::toAsciiUpperCase( static_cast<unsigned char>(*pStr) ) - 'A' + 10 ); else return false; pStr++; |