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

Timestamp:

Mar 14, 2014 9:13:23 PM (11 years ago)

Author:

vboxsync

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

92818

Message:

iprt: Added RTSTR_VALIDATE_ENCODING_EXACT_LENGTH for RTStrValidateEncodingEx and RTUtf16ValidateEncodingEx.

Location:

trunk/src/VBox/Runtime/common/string

Files:

• utf-16.cpp (modified) (2 diffs)
• utf-8.cpp (modified) (2 diffs)

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

@@ -319 +319 @@
 RTDECL(int) RTUtf16ValidateEncodingEx(PCRTUTF16 pwsz, size_t cwc, uint32_t fFlags)
 {
-    AssertReturn(!(fFlags & ~(RTSTR_VALIDATE_ENCODING_ZERO_TERMINATED)), VERR_INVALID_PARAMETER);
+    AssertReturn(!(fFlags & ~(RTSTR_VALIDATE_ENCODING_ZERO_TERMINATED | RTSTR_VALIDATE_ENCODING_EXACT_LENGTH)),
+                 VERR_INVALID_PARAMETER);
     AssertPtr(pwsz);
 
@@ -330 +331 @@
     if (RT_SUCCESS(rc))
     {
-        if (    (fFlags & RTSTR_VALIDATE_ENCODING_ZERO_TERMINATED)
-            &&  cwcActual >= cwc)
+        if (fFlags & RTSTR_VALIDATE_ENCODING_EXACT_LENGTH)
+        {
+            if (fFlags & RTSTR_VALIDATE_ENCODING_ZERO_TERMINATED)
+                cwcActual++;
+            if (cwcActual == cwc)
+                rc = VINF_SUCCESS;
+            else if (cwcActual < cwc)
+                rc = VERR_BUFFER_UNDERFLOW;
+            else
+                rc = VERR_BUFFER_OVERFLOW;
+        }
+        else if (    (fFlags & RTSTR_VALIDATE_ENCODING_ZERO_TERMINATED)
+                 &&  cwcActual >= cwc)
             rc = VERR_BUFFER_OVERFLOW;
     }

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

@@ -301 +301 @@
 RTDECL(int) RTStrValidateEncodingEx(const char *psz, size_t cch, uint32_t fFlags)
 {
-    AssertReturn(!(fFlags & ~(RTSTR_VALIDATE_ENCODING_ZERO_TERMINATED)), VERR_INVALID_PARAMETER);
+    AssertReturn(!(fFlags & ~(RTSTR_VALIDATE_ENCODING_ZERO_TERMINATED | RTSTR_VALIDATE_ENCODING_EXACT_LENGTH)),
+                 VERR_INVALID_PARAMETER);
     AssertPtr(psz);
 
@@ -312 +313 @@
     if (RT_SUCCESS(rc))
     {
-        if (    (fFlags & RTSTR_VALIDATE_ENCODING_ZERO_TERMINATED)
-            &&  cchActual >= cch)
+        if (fFlags & RTSTR_VALIDATE_ENCODING_EXACT_LENGTH)
+        {
+            if (fFlags & RTSTR_VALIDATE_ENCODING_ZERO_TERMINATED)
+                cchActual++;
+            if (cchActual == cch)
+                rc = VINF_SUCCESS;
+            else if (cchActual < cch)
+                rc = VERR_BUFFER_UNDERFLOW;
+            else
+                rc = VERR_BUFFER_OVERFLOW;
+        }
+        else if (    (fFlags & RTSTR_VALIDATE_ENCODING_ZERO_TERMINATED)
+                 &&  cchActual >= cch)
             rc = VERR_BUFFER_OVERFLOW;
     }