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

Timestamp:

Feb 10, 2012 9:35:27 PM (13 years ago)

Author:

vboxsync

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

76205

Message:

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

Location:

trunk/src/VBox/Runtime/common/string

Files:

• utf-16.cpp (modified) (1 diff)
• utf-8.cpp (modified) (1 diff)

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

@@ -250 +250 @@
 
 
+ssize_t RTUtf16PurgeComplementSet(PRTUTF16 pwsz, PCRTUNICP puszValidSet, char chReplacement)
+{
+    size_t cReplacements = 0;
+    AssertReturn(chReplacement && (unsigned)chReplacement < 128, -1);
+    /* Validate the encoding. */
+    if (RT_FAILURE(RTUtf16CalcUtf8LenEx(pwsz, RTSTR_MAX, NULL)))
+        return -1;
+    for (;;)
+    {
+        RTUNICP Cp;
+        PCRTUNICP pCp;
+        PRTUTF16 pwszOld = pwsz;
+        RTUtf16GetCpEx((PCRTUTF16 *)&pwsz, &Cp);
+        if (!Cp)
+            break;
+        for (pCp = puszValidSet; ; ++pCp)
+            if (!*pCp || *pCp == Cp)
+                break;
+        if (!*pCp)
+        {
+            for (; pwszOld != pwsz; ++pwszOld)
+                *pwszOld = chReplacement;
+            ++cReplacements;
+        }
+    }
+    return cReplacements;
+}
+RT_EXPORT_SYMBOL(RTUtf16PurgeComplementSet);
+
+
 /**
  * Validate the UTF-16 encoding and calculates the length of an UTF-8 encoding.

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

@@ -350 +350 @@
 }
 RT_EXPORT_SYMBOL(RTStrPurgeEncoding);
+
+
+ssize_t RTStrPurgeComplementSet(char *psz, PCRTUNICP puszValidSet, char chReplacement)
+{
+    size_t cReplacements = 0;
+    AssertReturn(chReplacement && (unsigned)chReplacement < 128, -1);
+    if (RT_FAILURE(RTStrValidateEncoding(psz)))
+        return -1;
+    for (;;)
+    {
+        RTUNICP Cp;
+        PCRTUNICP pCp;
+        char *pszOld = psz;
+        RTStrGetCpEx((const char **)&psz, &Cp);
+        if (!Cp)
+            break;
+        for (pCp = puszValidSet; ; ++pCp)
+            if (!*pCp || *pCp == Cp)
+                break;
+        if (!*pCp)
+        {
+            for (; pszOld != psz; ++pszOld)
+                *pszOld = chReplacement;
+            ++cReplacements;
+        }
+    }
+    return cReplacements;
+}
+RT_EXPORT_SYMBOL(RTStrPurgeComplementSet);