diff options
Diffstat (limited to 'core/src/fxcrt/fx_basic_gcc.cpp')
-rw-r--r-- | core/src/fxcrt/fx_basic_gcc.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/core/src/fxcrt/fx_basic_gcc.cpp b/core/src/fxcrt/fx_basic_gcc.cpp index 6f17482156..250079913c 100644 --- a/core/src/fxcrt/fx_basic_gcc.cpp +++ b/core/src/fxcrt/fx_basic_gcc.cpp @@ -5,6 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include <limits> +#include <cctype> #include "../../include/fxcrt/fx_ext.h" #include "../../include/fxcrt/fx_string.h" @@ -12,22 +13,19 @@ template <class T, class STR_T> T FXSYS_StrToInt(STR_T str) { FX_BOOL neg = FALSE; - if (str == NULL) { + if (!str) return 0; - } + if (*str == '-') { neg = TRUE; str++; } T num = 0; - while (*str) { - if ((*str) < '0' || (*str) > '9') { + while (*str && std::isdigit(*str)) { + if (num > (std::numeric_limits<T>::max() - 9) / 10) break; - } - if (num > (std::numeric_limits<T>::max() - 9) / 10) { - break; - } - num = num * 10 + (*str) - '0'; + + num = num * 10 + FXSYS_toDecimalDigit(*str); str++; } return neg ? -num : num; |