diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-09-19 15:57:02 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-09-19 15:59:03 +0100 |
commit | c708c9351bf2ef578e2f200ee834731c31d80261 (patch) | |
tree | bc869d7117c3934dafeb8244b6e7047d63b57777 /writerfilter/source/rtftok/rtftokenizer.cxx | |
parent | 8d5db645ca0c910fc624d3513be7d312aea4a49c (diff) |
fftester: isAsciiLowerCase has a isUnicodeCodePoint assert
which is not helpful when the data is incoming from the outside
world
Change-Id: I00304ed0d577944a33f5fa6af155f1d130ab7d59
Diffstat (limited to 'writerfilter/source/rtftok/rtftokenizer.cxx')
-rw-r--r-- | writerfilter/source/rtftok/rtftokenizer.cxx | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx index 8ca74334707d..5727b144d11c 100644 --- a/writerfilter/source/rtftok/rtftokenizer.cxx +++ b/writerfilter/source/rtftok/rtftokenizer.cxx @@ -170,24 +170,17 @@ int RTFTokenizer::asHex(char ch) ret = ch - '0'; else { - if (rtl::isAsciiLowerCase(ch)) - { - if (ch < 'a' || ch > 'f') - return -1; + if (ch >= 'a' && ch <= 'f') ret = ch - 'a'; - } - else - { - if (ch < 'A' || ch > 'F') - return -1; + else if (ch >= 'A' && ch <= 'F') ret = ch - 'A'; - } + else + return -1; ret += 10; } return ret; } - void RTFTokenizer::pushGroup() { m_nGroup++; |