Revert "Revert "Revert "Revert "Cleanup some numeric code.""""

core/src/fxcrt/fx_basic_util.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include <cctype>
+
 #include "../../include/fxcrt/fx_basic.h"
+#include "../../include/fxcrt/fx_ext.h"
+
 #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
 #include <sys/types.h>
 #include <dirent.h>
 #else
 #include <direct.h>
 #endif
+
 CFX_PrivateData::~CFX_PrivateData() {
   ClearAll();
 }
 void FX_PRIVATEDATA::FreeData() {
   if (m_pData == NULL) {
     return;
   }
   if (m_bSelfDestruct) {
     delete (CFX_DestructObject*)m_pData;
   } else if (m_pCallback) {
@@ skipping 69 matching lines @@
     int cc = 0, integer = 0;
     const FX_CHAR* str = strc.GetCStr();
     int len = strc.GetLength();
     FX_BOOL bNegative = FALSE;
     if (str[0] == '+') {
       cc++;
     } else if (str[0] == '-') {
       bNegative = TRUE;
       cc++;
     }
-    while (cc < len) {
-      if (str[cc] < '0' || str[cc] > '9') {
+    while (cc < len && std::isdigit(str[cc])) {
+      // TODO(dsinclair): Are these two checks for overflow needed?
+      if (integer > std::numeric_limits<int>::max() / 10)
         break;
-      }
-      integer = integer * 10 + str[cc] - '0';
-      if (integer < 0) {
+      integer *= 10;
+
+      if (integer > std::numeric_limits<int>::max() - 9)

[Tom Sepez, 2015/11/04 20:33:11]

Sorry, I blew it.  We should be able to parse 4294967295, but now we cant
because at the last character "5", integer is  4294967290 following the
multiplication, and its always larger than 4294967295 - 9.  What we meant to do
is call toDD() earlier

   int digit = FXSYS_toDecimalDigit(str[cc])
then
   if (integer > std::numeric_limits<int>::max() - digit)

[dsinclair, 2015/11/04 21:31:28]

Actually, this code is just broken. If we did overflow, we'd break, and then
take the overflowed value anyway (possibly flipping the sign). All it does when
it overflows is to stop adding new values. It isn't actually handled in any way.

Not sure what the correct result is here, need to check the callers to see what
is done with pData.

[dsinclair, 2015/11/10 00:47:03]

I put it back to the wrong way as that was what the code did before. I left a
todo that it needs to be fixed. This whole function needs to determine what the
right thing to do with overflow is instead of just using the value that
overflowed.

         break;
-      }
+      integer += FXSYS_toDecimalDigit(str[cc]);
+
       cc++;
     }
     if (bNegative) {
       integer = -integer;
     }
     *(int*)pData = integer;
   } else {
     bInteger = FALSE;
     *(FX_FLOAT*)pData = FX_atof(strc);
   }
@@ skipping 16 matching lines @@
     if (str[cc] != '+' && str[cc] != '-') {
       break;
     }
     cc++;
   }
   FX_FLOAT value = 0;
   while (cc < len) {
     if (str[cc] == '.') {
       break;
     }
-    value = value * 10 + str[cc] - '0';
+    value = value * 10 + FXSYS_toDecimalDigit(str[cc]);
     cc++;
   }
   static const FX_FLOAT fraction_scales[] = {
       0.1f,         0.01f,         0.001f,        0.0001f,
       0.00001f,     0.000001f,     0.0000001f,    0.00000001f,
       0.000000001f, 0.0000000001f, 0.00000000001f};
   int scale = 0;
   if (cc < len && str[cc] == '.') {
     cc++;
     while (cc < len) {
-      value += fraction_scales[scale] * (str[cc] - '0');
+      value += fraction_scales[scale] * FXSYS_toDecimalDigit(str[cc]);
       scale++;
       if (scale == sizeof fraction_scales / sizeof(FX_FLOAT)) {
         break;
       }
       cc++;
     }
   }
   return bNegative ? -value : value;
 }
 
@@ skipping 195 matching lines @@
       d * m.b + e * m.e + f * m.h, d * m.c + e * m.f + f * m.i,
       g * m.a + h * m.d + i * m.g, g * m.b + h * m.e + i * m.h,
       g * m.c + h * m.f + i * m.i);
 }
 
 CFX_Vector_3by1 CFX_Matrix_3by3::TransformVector(const CFX_Vector_3by1& v) {
   return CFX_Vector_3by1(a * v.a + b * v.b + c * v.c,
                          d * v.a + e * v.b + f * v.c,
                          g * v.a + h * v.b + i * v.c);
 }