Fix FXSYS_StrToInt()

core/fxcrt/fx_basic_gcc_unittest.cpp

 // Copyright 2016 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.
 
 #include "core/include/fxcrt/fx_system.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(fxcrt, FXSYS_atoi) {
   EXPECT_EQ(0, FXSYS_atoi(""));
   EXPECT_EQ(0, FXSYS_atoi("0"));
   EXPECT_EQ(-1, FXSYS_atoi("-1"));
   EXPECT_EQ(2345, FXSYS_atoi("2345"));
+  EXPECT_EQ(-2147483647, FXSYS_atoi("-2147483647"));
+  // Handle the sign.
+  EXPECT_EQ(-2345, FXSYS_atoi("-2345"));
+  EXPECT_EQ(2345, FXSYS_atoi("+2345"));
+  // The max value.
   EXPECT_EQ(2147483647, FXSYS_atoi("2147483647"));
-  EXPECT_EQ(-2147483647, FXSYS_atoi("-2147483647"));
+  // The min value.
+  EXPECT_EQ(-2147483648, FXSYS_atoi("-2147483648"));
+  // With invalid char.
   EXPECT_EQ(9, FXSYS_atoi("9x9"));
 
-  // TODO(dsinclair): These are all wacky .....
-  EXPECT_EQ(2147483623, FXSYS_atoi("2147483623423412348"));
-  EXPECT_EQ(214748364, FXSYS_atoi("2147483648"));
-  // The digit is parsed as a positive value, so we end up not being able to
-  // handle the largest possible negative value.
-  EXPECT_EQ(-214748364, FXSYS_atoi("-2147483648"));
+  // Out of range values.
+  EXPECT_EQ(2147483647, FXSYS_atoi("2147483623423412348"));
+  EXPECT_EQ(2147483647, FXSYS_atoi("2147483648"));
+  EXPECT_EQ(-2147483648, FXSYS_atoi("-2147483650"));
 }
 
 TEST(fxcrt, FXSYS_atoi64) {
   EXPECT_EQ(0, FXSYS_atoi64(""));
   EXPECT_EQ(0, FXSYS_atoi64("0"));
   EXPECT_EQ(-1, FXSYS_atoi64("-1"));
   EXPECT_EQ(2345, FXSYS_atoi64("2345"));
+  EXPECT_EQ(-9223372036854775807LL, FXSYS_atoi64("-9223372036854775807"));
+  // Handle the sign.
+  EXPECT_EQ(-2345, FXSYS_atoi64("-2345"));
+  EXPECT_EQ(2345, FXSYS_atoi64("+2345"));
+  // The max value.
   EXPECT_EQ(9223372036854775807LL, FXSYS_atoi64("9223372036854775807"));
-  EXPECT_EQ(-9223372036854775807LL, FXSYS_atoi64("-9223372036854775807"));
+  // The min value.
+  EXPECT_EQ(-9223372036854775808LL, FXSYS_atoi64("-9223372036854775808"));
+  // With invalid char.
   EXPECT_EQ(9, FXSYS_atoi64("9x9"));
 
-  // TODO(dsinclair): These are all wacky .....
-  EXPECT_EQ(9223372036854712341LL, FXSYS_atoi64("922337203685471234123475807"));
-  EXPECT_EQ(922337203685477580LL, FXSYS_atoi64("9223372036854775808"));
-  // The digit is parsed as a positive value, so we end up not being able to
-  // handle the largest possible negative value.
-  EXPECT_EQ(-922337203685477580LL, FXSYS_atoi64("-9223372036854775808"));
+  // Out of range values.
+  EXPECT_EQ(9223372036854775807LL, FXSYS_atoi64("922337203685471234123475807"));
+  EXPECT_EQ(9223372036854775807LL, FXSYS_atoi64("9223372036854775808"));
+  EXPECT_EQ(-9223372036854775808LL, FXSYS_atoi64("-9223372036854775810"));
 }
 
 TEST(fxcrt, FXSYS_wtoi) {
   EXPECT_EQ(0, FXSYS_wtoi(L""));
   EXPECT_EQ(0, FXSYS_wtoi(L"0"));
   EXPECT_EQ(-1, FXSYS_wtoi(L"-1"));
   EXPECT_EQ(2345, FXSYS_wtoi(L"2345"));
+  EXPECT_EQ(-2147483647, FXSYS_wtoi(L"-2147483647"));
+  // The max value.
   EXPECT_EQ(2147483647, FXSYS_wtoi(L"2147483647"));
-  EXPECT_EQ(-2147483647, FXSYS_wtoi(L"-2147483647"));
+  // The min value.
+  EXPECT_EQ(-2147483648, FXSYS_wtoi(L"-2147483648"));
   EXPECT_EQ(9, FXSYS_wtoi64(L"9x9"));
 
-  // TODO(dsinclair): These are all wacky .....
-  EXPECT_EQ(2147483623, FXSYS_wtoi(L"2147483623423412348"));
-  EXPECT_EQ(214748364, FXSYS_wtoi(L"2147483648"));
-  // The digit is parsed as a positive value, so we end up not being able to
-  // handle the largest possible negative value.
-  EXPECT_EQ(-214748364, FXSYS_wtoi(L"-2147483648"));
+  // Out of range values.
+  EXPECT_EQ(2147483647, FXSYS_wtoi(L"2147483623423412348"));
+  EXPECT_EQ(2147483647, FXSYS_wtoi(L"2147483648"));
+  EXPECT_EQ(-2147483648, FXSYS_wtoi(L"-2147483652"));
 }
 
 TEST(fxcrt, FXSYS_wtoi64) {
   EXPECT_EQ(0, FXSYS_wtoi64(L""));
   EXPECT_EQ(0, FXSYS_wtoi64(L"0"));
   EXPECT_EQ(-1, FXSYS_wtoi64(L"-1"));
   EXPECT_EQ(2345, FXSYS_wtoi64(L"2345"));
+  EXPECT_EQ(-9223372036854775807LL, FXSYS_wtoi64(L"-9223372036854775807"));
+  // Handle the sign.
+  EXPECT_EQ(-2345, FXSYS_wtoi64(L"-2345"));
+  EXPECT_EQ(2345, FXSYS_wtoi64(L"+2345"));
+  // The max value.
   EXPECT_EQ(9223372036854775807LL, FXSYS_wtoi64(L"9223372036854775807"));
-  EXPECT_EQ(-9223372036854775807LL, FXSYS_wtoi64(L"-9223372036854775807"));
+  // The min value.
+  EXPECT_EQ(-9223372036854775808LL, FXSYS_wtoi64(L"-9223372036854775808"));
+  // With invalid char.
   EXPECT_EQ(9, FXSYS_wtoi64(L"9x9"));
 
-  // TODO(dsinclair): These are all wacky .....
-  EXPECT_EQ(9223372036854712341LL,
+  // Out of range values.
+  EXPECT_EQ(9223372036854775807LL,
             FXSYS_wtoi64(L"922337203685471234123475807"));
-  EXPECT_EQ(922337203685477580LL, FXSYS_wtoi64(L"9223372036854775808"));
-  // The digit is parsed as a positive value, so we end up not being able to
-  // handle the largest possible negative value.
-  EXPECT_EQ(-922337203685477580LL, FXSYS_wtoi64(L"-9223372036854775808"));
+  EXPECT_EQ(9223372036854775807LL, FXSYS_wtoi64(L"9223372036854775808"));
+  EXPECT_EQ(-9223372036854775808LL, FXSYS_wtoi64(L"-9223372036854775810"));
 }
 
 TEST(fxcrt, FXSYS_atoui) {
   EXPECT_EQ(0, FXSYS_atoui(""));
   EXPECT_EQ(0, FXSYS_atoui("0"));
-  EXPECT_EQ(0, FXSYS_atoui("-1"));
+  EXPECT_EQ(4294967295, FXSYS_atoui("-1"));

[dsinclair, 2016/03/24 02:41:06]

I think this is wrong, it should return 0 because - isn't valid.

   EXPECT_EQ(2345, FXSYS_atoui("2345"));
+  // Handle the sign.
+  EXPECT_EQ(4294964951, FXSYS_atoui("-2345"));

[dsinclair, 2016/03/24 02:41:06]

This should also be 0 I think.

+  EXPECT_EQ(2345, FXSYS_atoui("+2345"));
+  // The max value.
   EXPECT_EQ(4294967295, FXSYS_atoui("4294967295"));
   EXPECT_EQ(9, FXSYS_atoui("9x9"));
 
-  // TODO(dsinclair): These are all wacky .....
-  EXPECT_EQ(2147483623, FXSYS_atoi("2147483623423412348"));
-  EXPECT_EQ(429496729, FXSYS_atoi("4294967296"));
+  // Out of range values.
+  EXPECT_EQ(4294967295, FXSYS_atoui("2147483623423412348"));
+  EXPECT_EQ(4294967295, FXSYS_atoui("4294967296"));
+  EXPECT_EQ(4294967295, FXSYS_atoui("-4294967345"));

[dsinclair, 2016/03/24 02:41:06]

Also 0.

 }