Changeset 74160 in vbox for trunk/src/VBox/Runtime/common/string/strtonum.cpp

Timestamp:

Sep 9, 2018 1:53:25 PM (6 years ago)

Author:

vboxsync

Message:

IPRT/strtonum: Fixed problem handling INT64_MIN in RTStrToInt64Ex and friends.

File:

• trunk/src/VBox/Runtime/common/string/strtonum.cpp (modified) (2 diffs)

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

@@ -557 +557 @@
     int           iShift;
     int           rc;
-    int64_t       i64;
+    uint64_t      u64;
     unsigned char uch;
 
@@ -605 +605 @@
      * Note: We only support ascii digits at this time... :-)
      */
-    iShift = g_auchShift[uBase]; /** @todo test this, it's probably not 100% right yet. */
+    iShift = g_auchShift[uBase];
     pszValue = psz; /* (Prefix and sign doesn't count in the digit counting.) */
     rc = VINF_SUCCESS;
-    i64 = 0;
+    u64 = 0;
     while ((uch = (unsigned char)*psz) != 0)
     {
         unsigned char chDigit = g_auchDigits[uch];
-        int64_t i64Prev;
+        uint64_t u64Prev;
 
         if (chDigit >= uBase)
             break;
 
-        i64Prev = i64;
-        i64 *= uBase;
-        i64 += chDigit;
-        if (i64Prev > i64 || (i64Prev >> iShift))
+        u64Prev = u64;
+        u64 *= uBase;
+        u64 += chDigit;
+        if (u64Prev > u64 || (u64Prev >> iShift))
             rc = VWRN_NUMBER_TOO_BIG;
         psz++;
     }
 
-    if (!fPositive)
-        i64 = -i64;
+    if (   !(u64 & RT_BIT_64(63))
+        || (!fPositive && u64 == RT_BIT_64(63)) )
+    { /* likely */ }
+    else
+        rc = VWRN_NUMBER_TOO_BIG;
 
     if (pi64)
-        *pi64 = i64;
+        *pi64 = fPositive ? u64 : -(int64_t)u64;
 
     if (psz == pszValue)