Changeset 40074 in vbox for trunk/src/VBox/Runtime/testcase

Timestamp:

Feb 10, 2012 10:08:41 PM (13 years ago)

Author:

vboxsync

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

76208

Message:

Runtime/strings: add Utf-8 and Utf-16 sanitising to a white list of characters. Fix unit test.

File:

• trunk/src/VBox/Runtime/testcase/tstUtf8.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/testcase/tstUtf8.cpp

@@ -896 +896 @@
         const char *pcszIn;
         const char *pcszOut;
+        size_t      cwc;  /* Zero means the strings are Utf-8. */
         PCRTUNICP   pcCpSet;
         char        chReplacement;
@@ -902 +903 @@
     aTests[] =
     {
-        { "1234werttrew4321", "1234werttrew4321", aCpSet, '_', 0 },
+        { "1234werttrew4321", "1234werttrew4321", 0, aCpSet, '_', 0 },
         { "123654wert\xc2\xa2trew\xe2\x82\xac""4321",
-          "123_54wert_trew_4321", aCpSet, '_', 3 },
-        { "hjhj8766", "????????", aCpSet, '?', 8 },
-        { "123\xf0\xa4\xad\xa2""4", "123__4", aCpSet, '_', 1 }
-        /* No test for invalid encoding. */
+          "123_54wert_trew_4321", 0, aCpSet, '_', 3 },
+        { "hjhj8766", "????????", 0, aCpSet, '?', 8 },
+        { "123\xf0\xa4\xad\xa2""4", "123__4", 0, aCpSet, '_', 1 },
+        { "\xff\xff\0", "\xff\xff\0", 2, aCpSet, '_', -1 },
+        { "\xff\xff\0", "\xff\xff\0", 2, aCpSet, '_', -1 }
     };
     enum { MAX_IN_STRING = 256 };
@@ -916 +918 @@
         RTUTF16 wszOutCopy[MAX_IN_STRING], *pwszOutCopy = wszOutCopy;
         ssize_t cReplacements;
-        AssertRC(RTStrToUtf16Ex(aTests[i].pcszIn, RTSTR_MAX, &pwszInCopy,
-                                RT_ELEMENTS(wszInCopy), NULL));
-        AssertRC(RTStrToUtf16Ex(aTests[i].pcszOut, RTSTR_MAX, &pwszOutCopy,
-                                RT_ELEMENTS(wszOutCopy), NULL));
+        if (!aTests[i].cwc)
+        {
+            AssertRC(RTStrToUtf16Ex(aTests[i].pcszIn, RTSTR_MAX, &pwszInCopy,
+                                    RT_ELEMENTS(wszInCopy), NULL));
+            AssertRC(RTStrToUtf16Ex(aTests[i].pcszOut, RTSTR_MAX, &pwszOutCopy,
+                                    RT_ELEMENTS(wszOutCopy), NULL));
+        }
+        else
+        {
+            Assert(aTests[i].cwc <= RT_ELEMENTS(wszInCopy));
+            memcpy(wszInCopy, aTests[i].pcszIn, aTests[i].cwc * 2);
+            memcpy(wszOutCopy, aTests[i].pcszOut, aTests[i].cwc * 2);
+        }
         cReplacements = RTUtf16PurgeComplementSet(wszInCopy, aTests[i].pcCpSet,
                                                   aTests[i].chReplacement);