Fix createStringFromData

Author: kunitoki

modules/yup_core/text/yup_String.cpp

@@ -2245,24 +2245,25 @@ String String::createStringFromData (const void* const unknownData, int size)
     if (size == 1)
         return charToString ((yup_wchar) data[0]);
 
-    if (CharPointer_UTF16::isByteOrderMarkBigEndian (data)
-        || CharPointer_UTF16::isByteOrderMarkLittleEndian (data))
-    {
-        const int numChars = size / 2 - 1;
+    const auto bigEndianData = CharPointer_UTF16::isByteOrderMarkBigEndian (data);
 
-        StringCreationHelper builder ((size_t) numChars);
+    if (bigEndianData || CharPointer_UTF16::isByteOrderMarkLittleEndian (data))
+    {
+        const auto numUnits = size / 2 - 1;
+        const auto src = unalignedPointerCast<const uint16*> (data + 2);
+        const auto swapBytes = bigEndianData ? ByteOrder::swapIfLittleEndian<uint16>
+                                             : ByteOrder::swapIfBigEndian<uint16>;
 
-        auto src = unalignedPointerCast<const uint16*> (data + 2);
+        StringCreationHelper builder ((size_t) numUnits);
 
-        if (CharPointer_UTF16::isByteOrderMarkBigEndian (data))
+        for (int i = 0; i < numUnits;)
         {
-            for (int i = 0; i < numChars; ++i)
-                builder.write ((yup_wchar) ByteOrder::swapIfLittleEndian (src[i]));
-        }
-        else
-        {
-            for (int i = 0; i < numChars; ++i)
-                builder.write ((yup_wchar) ByteOrder::swapIfBigEndian (src[i]));
+            const uint16 wideBuffer[] { swapBytes (src[i]),
+                                        swapBytes ((i + 1 == numUnits) ? (uint16) 0 : src[i + 1]) };
+            const CharPointer_UTF16 ptr { reinterpret_cast<const CharPointer_UTF16::CharType*> (wideBuffer) };
+
+            builder.write (*ptr);
+            i += (int) ((ptr + 1).getAddress() - ptr.getAddress());
         }
 
         builder.write (0);
@@ -2745,3 +2746,4 @@ String String::dedentLines() const
 }
 
 } // namespace yup
+