diff options
Diffstat (limited to 'libutils/Unicode.cpp')
| -rw-r--r-- | libutils/Unicode.cpp | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/libutils/Unicode.cpp b/libutils/Unicode.cpp index 6cff0f476..5fd915524 100644 --- a/libutils/Unicode.cpp +++ b/libutils/Unicode.cpp @@ -180,15 +180,7 @@ ssize_t utf32_to_utf8_length(const char32_t *src, size_t src_len) size_t ret = 0; const char32_t *end = src + src_len; while (src < end) { - size_t char_len = utf32_codepoint_utf8_length(*src++); - if (SSIZE_MAX - char_len < ret) { - // If this happens, we would overflow the ssize_t type when - // returning from this function, so we cannot express how - // long this string is in an ssize_t. - android_errorWriteLog(0x534e4554, "37723026"); - return -1; - } - ret += char_len; + ret += utf32_codepoint_utf8_length(*src++); } return ret; } @@ -448,23 +440,14 @@ ssize_t utf16_to_utf8_length(const char16_t *src, size_t src_len) size_t ret = 0; const char16_t* const end = src + src_len; while (src < end) { - size_t char_len; if ((*src & 0xFC00) == 0xD800 && (src + 1) < end && (*(src + 1) & 0xFC00) == 0xDC00) { // surrogate pairs are always 4 bytes. - char_len = 4; + ret += 4; src += 2; } else { - char_len = utf32_codepoint_utf8_length((char32_t)*src++); - } - if (SSIZE_MAX - char_len < ret) { - // If this happens, we would overflow the ssize_t type when - // returning from this function, so we cannot express how - // long this string is in an ssize_t. - android_errorWriteLog(0x534e4554, "37723026"); - return -1; + ret += utf32_codepoint_utf8_length((char32_t) *src++); } - ret += char_len; } return ret; } |