Ticket #13184: 0001-MultibyteToWchar-use-ucnv_getNextUChar.patch

src/system/libroot/add-ons/icu/ICUCtypeData.cpp

@@ -223 +223 @@
     UErrorCode icuStatus = U_ZERO_ERROR;
 
     const char* buffer = mb;
-    UChar targetBuffer[2];
-    UChar* target = targetBuffer;
-    ucnv_toUnicode(converter, &target, target + 1, &buffer, buffer + mbLen,
-        NULL, FALSE, &icuStatus);
-    size_t sourceLengthUsed = buffer - mb;
-    size_t targetLengthUsed = (size_t)(target - targetBuffer);
-
-    if (icuStatus == U_BUFFER_OVERFLOW_ERROR && targetLengthUsed > 0) {
-        // we've got one character, which is all that we wanted
-        icuStatus = U_ZERO_ERROR;
-    }
+    UChar32 unicodeChar = ucnv_getNextUChar(converter, &buffer, buffer + mbLen,
+        &icuStatus);
 
     if (!U_SUCCESS(icuStatus)) {
-        // conversion failed because of illegal character sequence
         TRACE(("MultibyteToWchar(): illegal character sequence\n"));
         ucnv_resetToUnicode(converter);
         result = B_BAD_DATA;
-    } else  if (targetLengthUsed == 0) {
-        TRACE(("MultibyteToWchar(): incomplete character (len=%lu)\n", mbLen));
-        for (size_t i = 0; i < mbLen; ++i)
-            TRACE(("\tbyte %lu: %x\n", i, mb[i]));
-        mbState->count = sourceLengthUsed;
-        result = B_BAD_INDEX;
     } else {
-        UChar32 unicodeChar = 0xBADBEEF;
-        U16_GET(targetBuffer, 0, 0, 2, unicodeChar);
-
         if (unicodeChar == 0) {
             // reset to initial state
             _DropConverterFromMbState(mbState);
@@ -257 +238 @@
             lengthOut = 0;
         } else {
             mbState->count = 0;
-            lengthOut = sourceLengthUsed;
+            lengthOut = buffer - mb;
         }
 
         if (wcOut != NULL)