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

Timestamp:

Jun 21, 2010 8:35:09 AM (15 years ago)

Author:

vboxsync

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

62878

Message:

*: Replaced memchr(psz, '\0', cb) with RTStrEnd(psz, cb) and worked around memchr( _{RTSTR_MAX) issue in RTStrEnd. Here (linux.amd64 / glibc-2.10.1-r1) memchr fails for cb > ~(size_t)11. Since RTSTR_MAX is ~(size_t)0, this behavior breaks several IPRT string APIs.}

Location:

trunk/src/VBox/Runtime/testcase

Files:

• tstNoCrt-1.cpp (modified) (2 diffs)
• tstRTSystemQueryDmi.cpp (modified) (2 diffs)
• tstRTSystemQueryOsInfo.cpp (modified) (2 diffs)
• tstUtf8.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/testcase/tstNoCrt-1.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2008 Oracle Corporation
+ * Copyright (C) 2008-2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -427 +427 @@
     pv = RT_NOCRT(memchr)(&s_szTest1[0x00], 'f', sizeof(s_szTest1)); CHECK_PV(&s_szTest1[0xf]);
     pv = RT_NOCRT(memchr)(&s_szTest1[0x0f], 'f', sizeof(s_szTest1)); CHECK_PV(&s_szTest1[0xf]);
-    pv = RT_NOCRT(memchr)(&s_szTest1[0x03], 0, sizeof(s_szTest1)); CHECK_PV(&s_szTest1[0x10]);
-    pv = RT_NOCRT(memchr)(&s_szTest1[0x10], 0, sizeof(s_szTest1)); CHECK_PV(&s_szTest1[0x10]);
+    pv = RT_NOCRT(memchr)(&s_szTest1[0x03],   0, sizeof(s_szTest1)); CHECK_PV(&s_szTest1[0x10]);
+    pv = RT_NOCRT(memchr)(&s_szTest1[0x10],   0, sizeof(s_szTest1)); CHECK_PV(&s_szTest1[0x10]);
+    pv = RT_NOCRT(memchr)(&s_szTest1,         0, ~(size_t)0);        CHECK_PV(&s_szTest1[0x10]);
+    pv = RT_NOCRT(memchr)(&s_szTest1,         0, ~(size_t)1);        CHECK_PV(&s_szTest1[0x10]);
+    pv = RT_NOCRT(memchr)(&s_szTest1,         0, ~(size_t)16);       CHECK_PV(&s_szTest1[0x10]);
     for (unsigned i = 0; i < sizeof(s_szTest1); i++)
         for (unsigned j = 0; j <= i; j++)

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

@@ -74 +74 @@
             RTTestIFailed("level=%d; unterminated buffer on VERR_NOT_SUPPORTED\n", i);
         else if (RT_SUCCESS(rc) || rc == VERR_BUFFER_OVERFLOW)
-            RTTESTI_CHECK(memchr(szInfo, '\0', sizeof(szInfo)) != NULL);
+            RTTESTI_CHECK(RTStrEnd(szInfo, sizeof(szInfo)) != NULL);
         else if (rc != VERR_NOT_SUPPORTED && rc != VERR_ACCESS_DENIED)
             RTTestIFailed("level=%d unexpected rc=%Rrc\n", i, rc);
@@ -109 +109 @@
 
             /* check for zero terminator. */
-            if (!memchr(szInfo, '\0', cch))
+            if (!RTStrEnd(szInfo, cch))
                 RTTestIFailed("level=%d, rc=%Rrc, cch=%zu: Buffer not terminated!\n", i, rc, cch);
         }

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

@@ -77 +77 @@
             RTTestIFailed("level=%d; unterminated buffer on VERR_NOT_SUPPORTED\n", i);
         else if (RT_SUCCESS(rc) || rc == VERR_BUFFER_OVERFLOW)
-            RTTESTI_CHECK(memchr(szInfo, '\0', sizeof(szInfo)) != NULL);
+            RTTESTI_CHECK(RTStrEnd(szInfo, sizeof(szInfo)) != NULL);
         else if (rc != VERR_NOT_SUPPORTED)
             RTTestIFailed("level=%d unexpected rc=%Rrc\n", i, rc);
@@ -112 +112 @@
 
             /* check for zero terminator. */
-            if (!memchr(szInfo, '\0', cch))
+            if (!RTStrEnd(szInfo, cch))
                 RTTestIFailed("level=%d, rc=%Rrc, cch=%zu: Buffer not terminated!\n", i, rc, cch);
         }

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

@@ -844 +844 @@
 
     RTTestSubDone(hTest);
+}
+
+
+/**
+ * Tests RTStrEnd
+ */
+static void testStrEnd(RTTEST hTest)
+{
+    RTTestSub(hTest, "RTStrEnd");
+
+    static char const s_szEmpty[1] = "";
+    RTTESTI_CHECK(RTStrEnd(s_szEmpty, 0) == NULL);
+    RTTESTI_CHECK(RTStrEnd(s_szEmpty, 1) == &s_szEmpty[0]);
+    for (size_t i = 0; i < _1M; i++)
+        RTTESTI_CHECK(RTStrEnd(s_szEmpty, ~i) == &s_szEmpty[0]);
+
 }
 
@@ -1222 +1238 @@
     test3(hTest);
     TstRTStrXCmp(hTest);
+    testStrEnd(hTest);
     testStrStr(hTest);
     testMinistring(hTest);