Changeset 5781 in vbox for trunk/src/VBox/Runtime

Timestamp:

Nov 16, 2007 6:55:05 PM (17 years ago)

Author:

vboxsync

Message:

Fixed some overflow detection issues.

Location:

trunk/src/VBox/Runtime

Files:

• common/string/strtonum.cpp (modified) (3 diffs)
• testcase/tstStrToNum.cpp (modified) (8 diffs)

trunk/src/VBox/Runtime/common/string/strtonum.cpp

@@ -39 +39 @@
     255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255
 };
-/** Approximated overflow shift checks.
- * @todo make the overflow stuff work for real. */
+/** Approximated overflow shift checks. */
 static const char g_auchShift[36] =
 {
   /*  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15  16  17  18  19  20  21  22  23  24  25  26  27  28  29  30  31  32  33  34  35 */
-     64, 64, 63, 63, 62, 62, 61, 61, 60, 60, 59, 59, 58, 58, 57, 57, 56, 56, 55, 55, 54, 54, 53, 53, 52, 52, 51, 51, 50, 50, 49, 49, 50, 50, 51, 51
+     64, 64, 63, 63, 62, 62, 62, 62, 61, 61, 61, 61, 61, 61, 61, 61, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 59, 59, 59, 59
 };
 
@@ -573 +572 @@
      * Note: We only support ascii digits at this time... :-)
      */
-    //int             iShift = g_auchShift[uBase];
+    int             iShift = g_auchShift[uBase]; /** @todo test this, it's probably not 100% right yet. */
     pszValue = psz; /* (Prefix and sign doesn't count in the digit counting.) */
     int             rc = VINF_SUCCESS;
@@ -587 +586 @@
         i64 *= uBase;
         i64 += chDigit;
-        if (i64Prev > i64/* || (i64Prev >> iShift)*/)
+        if (i64Prev > i64 || (i64Prev >> iShift))
             rc = VWRN_NUMBER_TOO_BIG;
         psz++;

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

@@ -53 +53 @@
 
 
-#define TEST(Test, Type, Fmt, Fun) \
+#define TEST(Test, Type, Fmt, Fun, iTest) \
     do \
     { \
@@ -60 +60 @@
         if (Result != Test.Result) \
         { \
-            RTPrintf("failure: '%s' -> " Fmt " expected " Fmt ". (%s)\n", Test.psz, Result, Test.Result, #Fun); \
+            RTPrintf("failure: '%s' -> " Fmt " expected " Fmt ". (%s/%u)\n", Test.psz, Result, Test.Result, #Fun, iTest); \
             cErrors++; \
         } \
         else if (rc != Test.rc) \
         { \
-            RTPrintf("failure: '%s' -> rc=%Vrc expected %Vrc. (%s)\n", Test.psz, rc, Test.rc, #Fun); \
+            RTPrintf("failure: '%s' -> rc=%Vrc expected %Vrc. (%s/%u)\n", Test.psz, rc, Test.rc, #Fun, iTest); \
             cErrors++; \
         } \
@@ -76 +76 @@
         for (unsigned iTest = 0; iTest < ELEMENTS(aTests); iTest++) \
         { \
-            TEST(aTests[iTest], Type, Fmt, Fun); \
+            TEST(aTests[iTest], Type, Fmt, Fun, iTest); \
         } \
     } while (0)
@@ -88 +88 @@
         { "1",                      0,  VINF_SUCCESS,           1 },
         { "-1",                     0,  VWRN_NEGATIVE_UNSIGNED,  ~0ULL },
-        { "0x",                     0,  VINF_SUCCESS,           0 },
+        { "0x",                     0,  VWRN_TRAILING_CHARS,    0 },
         { "0x1",                    0,  VINF_SUCCESS,           1 },
         { "0x0fffffffffffffff",     0,  VINF_SUCCESS,           0x0fffffffffffffffULL },
@@ -94 +94 @@
         { "asdfasdfasdf",           0,  VERR_NO_DIGITS,         0 },
         { "0x111111111",            0,  VINF_SUCCESS,           0x111111111ULL },
+        { "4D9702C5CBD9B778",      16,  VINF_SUCCESS,           UINT64_C(0x4D9702C5CBD9B778) },
     };
     RUN_TESTS(aTstU64, uint64_t, "%#llx", RTStrToUInt64Ex);
@@ -126 +127 @@
         { "-1234567890123456789",   0,  VINF_SUCCESS,          -1234567890123456789LL },
         { "-1234567890123456789",  10,  VINF_SUCCESS,          -1234567890123456789LL },
-        { "0x",                     0,  VINF_SUCCESS,           0 },
-        { "0x1",                    0,  VINF_SUCCESS,           1 },
-        { "0x1",                   10,  VINF_SUCCESS,           0 },
+        { "0x",                     0,  VWRN_TRAILING_CHARS,    0 },
+        { "0x1",                    0,  VINF_SUCCESS,           1 },
+        { "0x1",                   10,  VWRN_TRAILING_CHARS,    0 },
         { "0x1",                   16,  VINF_SUCCESS,           1 },
         { "0x0fffffffffffffff",     0,  VINF_SUCCESS,           0x0fffffffffffffffULL },
-        //{ "0x01111111111111111111111",0,  VWRN_NUMBER_TOO_BIG,  0x1111111111111111ULL },
+        { "0x7fffffffffffffff",     0,  VINF_SUCCESS,           0x7fffffffffffffffULL },
+        { "0xffffffffffffffff",     0,  VWRN_NUMBER_TOO_BIG,    -1 },
+        { "0x01111111111111111111111",0,  VWRN_NUMBER_TOO_BIG,  0x1111111111111111ULL },
+        { "0x02222222222222222222222",0,  VWRN_NUMBER_TOO_BIG,  0x2222222222222222ULL },
+        { "0x03333333333333333333333",0,  VWRN_NUMBER_TOO_BIG,  0x3333333333333333ULL },
+        { "0x04444444444444444444444",0,  VWRN_NUMBER_TOO_BIG,  0x4444444444444444ULL },
+        { "0x07777777777777777777777",0,  VWRN_NUMBER_TOO_BIG,  0x7777777777777777ULL },
+        { "0x07f7f7f7f7f7f7f7f7f7f7f",0,  VWRN_NUMBER_TOO_BIG,  0x7f7f7f7f7f7f7f7fULL },
         { "0x0ffffffffffffffffffffff",0,  VWRN_NUMBER_TOO_BIG,  0xffffffffffffffffULL },
         { "asdfasdfasdf",           0,  VERR_NO_DIGITS,         0 },
@@ -173 +181 @@
         { "1234567890123456789",    0,  VWRN_NUMBER_TOO_BIG,   (int32_t)1234567890123456789LL },
         { "1234567890123456789",   10,  VWRN_NUMBER_TOO_BIG,   (int32_t)1234567890123456789LL },
-        { "0x",                     0,  VINF_SUCCESS,           0 },
-        { "0x1",                    0,  VINF_SUCCESS,           1 },
-        { "0x1",                   10,  VINF_SUCCESS,           0 },
+        { "0x",                     0,  VWRN_TRAILING_CHARS,    0 },
+        { "0x1",                    0,  VINF_SUCCESS,           1 },
+        { "0x1",                   10,  VWRN_TRAILING_CHARS,    0 },
         { "0x1",                   16,  VINF_SUCCESS,           1 },
-        { "0x0fffffffffffffff",     0,  VWRN_NUMBER_TOO_BIG,           0xffffffff },
+        { "0x7fffffff",             0,  VINF_SUCCESS,           0x7fffffff },
+        { "0x80000000",             0,  VWRN_NUMBER_TOO_BIG,    INT32_MIN },
+        { "0xffffffff",             0,  VWRN_NUMBER_TOO_BIG,    -1 },
+        { "0x0fffffffffffffff",     0,  VWRN_NUMBER_TOO_BIG,    0xffffffff },
         { "0x01111111111111111111111",0,  VWRN_NUMBER_TOO_BIG,  0x11111111 },
         { "0x0ffffffffffffffffffffff",0,  VWRN_NUMBER_TOO_BIG,  0xffffffff },
@@ -190 +201 @@
         { "1",                      0,  VINF_SUCCESS,           1 },
         { "-1",                     0,  VWRN_NEGATIVE_UNSIGNED, ~0 },
-        { "0x",                     0,  VINF_SUCCESS,           0 },
+        { "0x",                     0,  VWRN_TRAILING_CHARS,    0 },
         { "0x1",                    0,  VINF_SUCCESS,           1 },
         { "0x0fffffffffffffff",     0,  VWRN_NUMBER_TOO_BIG,    0xffffffffU },