Changeset 31213 in vbox for trunk/src/VBox/Runtime

Timestamp:

Jul 29, 2010 1:52:23 PM (14 years ago)

Author:

vboxsync

Message:

Runtime/string: Utf-8 to Latin-1 translation should be exact or fail

File:

• trunk/src/VBox/Runtime/common/string/utf-8.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/common/string/utf-8.cpp

@@ -1052 +1052 @@
             uint16_t uc = (puch[1] & 0x3f)
                     | ((uint16_t)(uch     & 0x1f) << 6);
-            *puchOut++ = uc < 0x100 ? uc : '?';
+            if (uc >= 0x100)
+            {
+                rc = VERR_NO_TRANSLATION;
+                break;
+            }
+            *puchOut++ = uc;
             puch += 2;
             cch -= 2;
         }
-        else if ((uch & (RT_BIT(7) | RT_BIT(6) | RT_BIT(5) | RT_BIT(4))) == (RT_BIT(7) | RT_BIT(6) | RT_BIT(5)))
-        {
-            *puchOut++ = '?';
-            puch += 3;
-            cch -= 3;
-        }
-        else
-        {
-            *puchOut++ = '?';
-            puch += 4;
-            cch -= 4;
+        else
+        {
+            rc = VERR_NO_TRANSLATION;
+            break;
         }
     }