commit 8c170ef764b2703669e163842d22ba42b042ebb2
author Brian Carlstrom <bdc@google.com> Tue Jun 10 22:36:33 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 10 22:06:31 2014 +0000
tree cb14433f2f450e4cadd16dd6ae90385acc6fd900
parent 72299bf0d240072174f847d13f1c9498b3ef9fa6
parent b495400451d53a2d6a57fb1d23315d719d82f802

Merge "Remove libstdc++ dependency from host libbacktrace" into lmp-preview-dev

libutils/Unicode.cpp

diff --git a/libutils/Unicode.cpp b/libutils/Unicode.cpp
index a66e3bb..1ee1a0b 100644
--- a/libutils/Unicode.cpp
+++ b/libutils/Unicode.cpp
@@ -342,7 +342,8 @@
     while (cur_utf16 < end_utf16) {
         char32_t utf32;
         // surrogate pairs
-        if ((*cur_utf16 & 0xFC00) == 0xD800) {
+        if((*cur_utf16 & 0xFC00) == 0xD800 && (cur_utf16 + 1) < end_utf16
+                && (*(cur_utf16 + 1) & 0xFC00) == 0xDC00) {
             utf32 = (*cur_utf16++ - 0xD800) << 10;
             utf32 |= *cur_utf16++ - 0xDC00;
             utf32 += 0x10000;