summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXin Li2017-11-14 14:12:57 -0600
committerXin Li2017-11-14 15:19:45 -0600
commit23e27db576d06761363365494327baf062468a66 (patch)
treecc76a40025c2189fc70dd6edd4a0eba251fd7b44 /libutils/Unicode.cpp
parentea41bcf7a3a9095feb39cc6bd37d865c2eec3c36 (diff)
parenta63ccea6abc7ea02e2d98e41c80793ca97237bd3 (diff)
downloadplatform-system-core-23e27db576d06761363365494327baf062468a66.tar.gz
platform-system-core-23e27db576d06761363365494327baf062468a66.tar.xz
platform-system-core-23e27db576d06761363365494327baf062468a66.zip
Merge commit 'a63ccea6abc7ea02e2d98e41c80793ca97237bd3' from
oc-mr1-dev-plus-aosp into stage-aosp-master Change-Id: Ia33311cd1fd26dfaea59a69317b306fb91203c40 Merged-In: I03d06b10807e8a313c9654c2e1db36bfb59e3f99
Diffstat (limited to 'libutils/Unicode.cpp')
-rw-r--r--libutils/Unicode.cpp23
1 files changed, 20 insertions, 3 deletions
diff --git a/libutils/Unicode.cpp b/libutils/Unicode.cpp
index e7520a8e8..108683145 100644
--- a/libutils/Unicode.cpp
+++ b/libutils/Unicode.cpp
@@ -180,7 +180,15 @@ ssize_t utf32_to_utf8_length(const char32_t *src, size_t src_len)
180 size_t ret = 0; 180 size_t ret = 0;
181 const char32_t *end = src + src_len; 181 const char32_t *end = src + src_len;
182 while (src < end) { 182 while (src < end) {
183 ret += utf32_codepoint_utf8_length(*src++); 183 size_t char_len = utf32_codepoint_utf8_length(*src++);
184 if (SSIZE_MAX - char_len < ret) {
185 // If this happens, we would overflow the ssize_t type when
186 // returning from this function, so we cannot express how
187 // long this string is in an ssize_t.
188 android_errorWriteLog(0x534e4554, "37723026");
189 return -1;
190 }
191 ret += char_len;
184 } 192 }
185 return ret; 193 return ret;
186} 194}
@@ -439,14 +447,23 @@ ssize_t utf16_to_utf8_length(const char16_t *src, size_t src_len)
439 size_t ret = 0; 447 size_t ret = 0;
440 const char16_t* const end = src + src_len; 448 const char16_t* const end = src + src_len;
441 while (src < end) { 449 while (src < end) {
450 size_t char_len;
442 if ((*src & 0xFC00) == 0xD800 && (src + 1) < end 451 if ((*src & 0xFC00) == 0xD800 && (src + 1) < end
443 && (*(src + 1) & 0xFC00) == 0xDC00) { 452 && (*(src + 1) & 0xFC00) == 0xDC00) {
444 // surrogate pairs are always 4 bytes. 453 // surrogate pairs are always 4 bytes.
445 ret += 4; 454 char_len = 4;
446 src += 2; 455 src += 2;
447 } else { 456 } else {
448 ret += utf32_codepoint_utf8_length((char32_t) *src++); 457 char_len = utf32_codepoint_utf8_length((char32_t)*src++);
458 }
459 if (SSIZE_MAX - char_len < ret) {
460 // If this happens, we would overflow the ssize_t type when
461 // returning from this function, so we cannot express how
462 // long this string is in an ssize_t.
463 android_errorWriteLog(0x534e4554, "37723026");
464 return -1;
449 } 465 }
466 ret += char_len;
450 } 467 }
451 return ret; 468 return ret;
452} 469}