diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-10-07 13:28:18 -0700 |
|---|---|---|
| committer | Alex Ray <aray@google.com> | 2013-07-30 13:56:58 -0700 |
| commit | aa983c91caf848b9659599336a4156c28a125fa9 (patch) | |
| tree | 0c7a851cafa35df4426b7ad754a8397e31675f26 /libs/utils | |
| parent | 6c31a2fb6080049e444b4aac71b037eccd0d3ddc (diff) | |
| download | system_core-aa983c91caf848b9659599336a4156c28a125fa9.zip system_core-aa983c91caf848b9659599336a4156c28a125fa9.tar.gz system_core-aa983c91caf848b9659599336a4156c28a125fa9.tar.bz2 | |
Fix regression in CursorWindow.copyStingToBuffer.
Bug: 5332296
Change-Id: Iff9eed786f0a8293b6156f883a66a322ddad5e99
Diffstat (limited to 'libs/utils')
| -rw-r--r-- | libs/utils/Unicode.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libs/utils/Unicode.cpp b/libs/utils/Unicode.cpp index 78c61b4..41cbf03 100644 --- a/libs/utils/Unicode.cpp +++ b/libs/utils/Unicode.cpp @@ -542,11 +542,7 @@ ssize_t utf8_to_utf16_length(const uint8_t* u8str, size_t u8len) return u16measuredLen; } -/** - * Convert a UTF-8 string to UTF-16. The destination UTF-16 buffer must have - * space for NULL at the end. - */ -void utf8_to_utf16(const uint8_t* u8str, size_t u8len, char16_t* u16str) +char16_t* utf8_to_utf16_no_null_terminator(const uint8_t* u8str, size_t u8len, char16_t* u16str) { const uint8_t* const u8end = u8str + u8len; const uint8_t* u8cur = u8str; @@ -569,7 +565,12 @@ void utf8_to_utf16(const uint8_t* u8str, size_t u8len, char16_t* u16str) u8cur += u8len; } - *u16cur = 0; + return u16cur; +} + +void utf8_to_utf16(const uint8_t* u8str, size_t u8len, char16_t* u16str) { + char16_t* end = utf8_to_utf16_no_null_terminator(u8str, u8len, u16str); + *end = 0; } } |