Changeset 21728 in vbox for trunk/src/VBox/Runtime/common/string

Timestamp:

Jul 20, 2009 3:11:45 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

50300

Message:

iprt/string: change behaviour of Utf16 to Latin1 to reject untranslatable strings instead of doing a best-effort translation

File:

• trunk/src/VBox/Runtime/common/string/utf-16.cpp (modified) (4 diffs)

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

@@ -667 +667 @@
         if (!wc)
             break;
+        else if (wc < 256)
+            ++cch;
         else if (wc < 0xd800 || wc > 0xdfff)
         {
             if (wc < 0xfffe)
-                ++cch;
+            {
+                rc = VERR_NO_TRANSLATION;
+                break;
+            }
             else
             {
@@ -699 +704 @@
                 break;
             }
-            ++cch;
+            rc = VERR_NO_TRANSLATION;
+            break;
         }
     }
@@ -745 +751 @@
             else if (wc < 0xfffe)
             {
-                if (cch < 1)
-                {
-                    RTStrAssertMsgFailed(("Buffer overflow! 3\n"));
-                    rc = VERR_BUFFER_OVERFLOW;
-                    break;
-                }
-                cch--;
-                *pwch++ = '?';
+                rc = VERR_NO_TRANSLATION;
+                break;
             }
             else
@@ -782 +782 @@
                 break;
             }
-            if (cch < 1)
-            {
-                RTStrAssertMsgFailed(("Buffer overflow! 4\n"));
-                rc = VERR_BUFFER_OVERFLOW;
-                break;
-            }
-            cch--;
-            *pwch++ = '?';
+            rc = VERR_NO_TRANSLATION;
+            break;
         }
     }