Changeset 32995 in vbox

Timestamp:

Oct 8, 2010 8:11:27 AM (14 years ago)

Author:

vboxsync

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

66506

Message:

RTUuidFromUtf16: bug fix + testcase

Location:

trunk/src/VBox/Runtime

Files:

• generic/uuid-generic.cpp (modified) (2 diffs)
• testcase/tstRTUuid.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/generic/uuid-generic.cpp

@@ -429 +429 @@
     AssertPtrReturn(pwszString, VERR_INVALID_PARAMETER);
 
-    fHaveBraces = (pwszString[0] == '{' && pwszString[37] == '}');
-    if (fHaveBraces)
-        pwszString++;
+    fHaveBraces = pwszString[0] == '{';
+    pwszString += fHaveBraces;
 
 #define MY_CHECK(expr) do { if (RT_UNLIKELY(!(expr))) return VERR_INVALID_UUID_FORMAT; } while (0)
@@ -471 +470 @@
     MY_CHECK(MY_ISXDIGIT(pwszString[34]));
     MY_CHECK(MY_ISXDIGIT(pwszString[35]));
-    MY_CHECK(!pwszString[36 + (fHaveBraces ? 1 : 0)]);
+    if (fHaveBraces)
+        MY_CHECK(pwszString[36] == '}');
+    MY_CHECK(!pwszString[36 + fHaveBraces]);
 #undef MY_ISXDIGIT
 #undef MY_CHECK

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

@@ -115 +115 @@
     rc = RTUuidToUtf16(&Uuid, wsz, sizeof(wsz)); CHECK_RC();
     RTTEST_CHECK(hTest, RTUtf16Len(wsz) == RTUUID_STR_LENGTH - 1);
+
+    RTUTF16 *pwsz;
+    rc = RTStrToUtf16(sz2, &pwsz);
+    RTTEST_CHECK(hTest, rc == VINF_SUCCESS);
+    if (RT_SUCCESS(rc))
+    {
+        RTTESTI_CHECK_RC(RTUuidFromUtf16(&Uuid2, pwsz), VINF_SUCCESS);
+        RTTEST_CHECK(hTest, RTUuidCompare(&Uuid, &Uuid2) == 0);
+        RTUTF16 *pwsz2 = (RTUTF16*)RTTestGuardedAllocTail(hTest, 2 * (RTUUID_STR_LENGTH + 2));
+        if (pwsz2)
+        {
+            memcpy(pwsz2, pwsz, 2 * (RTUUID_STR_LENGTH + 2));
+            RTTESTI_CHECK_RC(RTUuidFromUtf16(&Uuid2, pwsz2), VINF_SUCCESS);
+            RTTEST_CHECK(hTest, RTUuidCompare(&Uuid, &Uuid2) == 0);
+            for (unsigned off = 1; off < RTUUID_STR_LENGTH + 2; off++)
+            {
+                RTUTF16 *pwsz3 = pwsz2 + off;
+                memcpy(pwsz3, pwsz, 2 * (RTUUID_STR_LENGTH + 1 - off));
+                pwsz3[RTUUID_STR_LENGTH + 1 - off] = 0;
+                RTTESTI_CHECK_RC(RTUuidFromUtf16(&Uuid2, pwsz3), VERR_INVALID_UUID_FORMAT);
+            }
+            RTTestGuardedFree(hTest, pwsz2);
+        }
+        RTUtf16Free(pwsz);
+    }
 
     RTTestSub(hTest, "RTUuidFromUtf16");