Changeset 40091 in vbox

Timestamp:

Feb 13, 2012 10:14:00 AM (13 years ago)

Author:

vboxsync

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

76231

Message:

Runtime/strings: add Utf-8 and Utf-16 sanitising to a white list of characters. Do not validate the string encoding in advance.

Location:

trunk

Files:

• include/iprt/string.h (modified) (2 diffs)
• src/VBox/Runtime/common/string/utf-16.cpp (modified) (2 diffs)
• src/VBox/Runtime/common/string/utf-8.cpp (modified) (2 diffs)

trunk/include/iprt/string.h

@@ -711 +711 @@
  *
  * @returns The number of code points replaced, or a negative value if the
- *          string is not correctly encoded.  In this case the string will not
- *          be changed.
+ *          string is not correctly encoded.  In this last case the string
+ *          may be partially processed.
  * @param   psz            The string to sanitise.
  * @param   puszValidSet   A zero-terminated array of the Unicode code points
@@ -3325 +3325 @@
  *
  * @returns The number of code points replaced, or a negative value if the
- *          string is not correctly encoded.  In this case the string will not
- *          be changed.
+ *          string is not correctly encoded.  In this last case the string
+ *          may be partially processed.
  * @param   pwsz           The string to sanitise.
  * @param   puszValidSet   A zero-terminated array of the Unicode code points

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

@@ -255 +255 @@
     AssertReturn(chReplacement && (unsigned)chReplacement < 128, -1);
     /* Validate the encoding. */
-    if (RT_FAILURE(RTUtf16CalcUtf8LenEx(pwsz, RTSTR_MAX, NULL)))
-        return -1;
     for (;;)
     {
@@ -262 +260 @@
         PCRTUNICP pCp;
         PRTUTF16 pwszOld = pwsz;
-        RTUtf16GetCpEx((PCRTUTF16 *)&pwsz, &Cp);
+        if (RT_FAILURE(RTUtf16GetCpEx((PCRTUTF16 *)&pwsz, &Cp)))
+            return -1;
         if (!Cp)
             break;

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

@@ -356 +356 @@
     size_t cReplacements = 0;
     AssertReturn(chReplacement && (unsigned)chReplacement < 128, -1);
-    if (RT_FAILURE(RTStrValidateEncoding(psz)))
-        return -1;
     for (;;)
     {
@@ -363 +361 @@
         PCRTUNICP pCp;
         char *pszOld = psz;
-        RTStrGetCpEx((const char **)&psz, &Cp);
+        if (RT_FAILURE(RTStrGetCpEx((const char **)&psz, &Cp)))
+            return -1;
         if (!Cp)
             break;