Fix parsing of object numbers > 16,777,216.

core/src/fxcrt/fx_basic_gcc.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 <cwctype>
 #include <limits>
 
 #include "core/include/fxcrt/fx_ext.h"
 #include "core/include/fxcrt/fx_string.h"
 
 template <class T>
 T FXSYS_StrToInt(const FX_CHAR* str) {
-  FX_BOOL neg = FALSE;
+  bool neg = false;
   if (!str)
     return 0;
 
-  if (*str == '-') {
-    neg = TRUE;
+  if (std::numeric_limits<T>::is_signed && *str == '-') {
+    neg = true;
     str++;
   }
   T num = 0;
   while (*str && std::isdigit(*str)) {
-    if (num > (std::numeric_limits<T>::max() - 9) / 10)
+    T val = FXSYS_toDecimalDigit(*str);
+    if (num > (std::numeric_limits<T>::max() - val) / 10)
       break;
 
-    num = num * 10 + FXSYS_toDecimalDigit(*str);
+    num = num * 10 + val;
     str++;
   }
   return neg ? -num : num;
 }
 
 template <class T>
 T FXSYS_StrToInt(const FX_WCHAR* str) {
-  FX_BOOL neg = FALSE;
+  bool neg = false;
   if (!str)
     return 0;
 
-  if (*str == '-') {
-    neg = TRUE;
+  if (std::numeric_limits<T>::is_signed && *str == '-') {
+    neg = true;
     str++;
   }
   T num = 0;
   while (*str && std::iswdigit(*str)) {
-    if (num > (std::numeric_limits<T>::max() - 9) / 10)
+    T val = FXSYS_toDecimalDigitWide(*str);

[Tom Sepez, 2016/03/02 21:53:36]

If you really want some fun, try overloading FXSYS_toDecimalDigit() and create
an overloaded FXSYS_isDecimalDigit() to replace the iswdigit call above,
then fold this into the above template like

template <typename IntType, typename CharType> ...

[dsinclair, 2016/03/02 22:09:17]

Will do in a separate CL.
https://bugs.chromium.org/p/pdfium/issues/detail?id=423

+    if (num > (std::numeric_limits<T>::max() - val) / 10)
       break;
 
-    num = num * 10 + FXSYS_toDecimalDigitWide(*str);
+    num = num * 10 + val;
     str++;
   }
   return neg ? -num : num;
 }
 
 template <typename T, typename UT, typename STR_T>
 STR_T FXSYS_IntToStr(T value, STR_T string, int radix) {
   if (radix < 2 || radix > 16) {
     string[0] = 0;
     return string;
@@ skipping 25 matching lines @@
   string[digits + i] = 0;
   return string;
 }
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 int32_t FXSYS_atoi(const FX_CHAR* str) {
   return FXSYS_StrToInt<int32_t>(str);
 }
+uint32_t FXSYS_atoui(const FX_CHAR* str) {
+  return FXSYS_StrToInt<uint32_t>(str);
+}
 int32_t FXSYS_wtoi(const FX_WCHAR* str) {
   return FXSYS_StrToInt<int32_t>(str);
 }
 int64_t FXSYS_atoi64(const FX_CHAR* str) {
   return FXSYS_StrToInt<int64_t>(str);
 }
 int64_t FXSYS_wtoi64(const FX_WCHAR* str) {
   return FXSYS_StrToInt<int64_t>(str);
 }
 const FX_CHAR* FXSYS_i64toa(int64_t value, FX_CHAR* str, int radix) {
@@ skipping 145 matching lines @@
       buf[wlen] = bstr[i];
     }
     wlen++;
   }
   return wlen;
 }
 #ifdef __cplusplus
 }
 #endif
 #endif