HexStringToUInt64 should fail for negative input

base/strings/string_number_conversions_unittest.cc

 // Copyright (c) 2012 The Chromium 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 <math.h>
 
 #include <limits>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 299 matching lines @@
 }
 
 TEST(StringNumberConversionsTest, HexStringToUInt64) {
   static const struct {
     std::string input;
     uint64 output;
     bool success;
   } cases[] = {
     {"0", 0, true},
     {"42", 66, true},
-    {"-42", -66, true},
+    {"-42", static_cast<uint64>(-66), false},
     {"+42", 66, true},
     {"40acd88557b", GG_INT64_C(4444444448123), true},
     {"7fffffff", INT_MAX, true},
-    {"-80000000", INT_MIN, true},
+    {"-80000000", static_cast<uint64>(INT_MIN), false},
     {"ffffffff", 0xffffffff, true},
     {"DeadBeef", 0xdeadbeef, true},
     {"0x42", 66, true},
-    {"-0x42", -66, true},
+    {"-0x42", static_cast<uint64>(-66), false},
     {"+0x42", 66, true},
     {"0x40acd88557b", GG_INT64_C(4444444448123), true},
     {"0x7fffffff", INT_MAX, true},
-    {"-0x80000000", INT_MIN, true},
+    {"-0x80000000", static_cast<uint64>(INT_MIN), false},
     {"0xffffffff", 0xffffffff, true},
     {"0XDeadBeef", 0xdeadbeef, true},
     {"0x7fffffffffffffff", kint64max, true},
-    {"-0x8000000000000000", GG_UINT64_C(0x8000000000000000), true},
+    {"-0x8000000000000000", GG_UINT64_C(0x8000000000000000), false},
     {"0x8000000000000000", GG_UINT64_C(0x8000000000000000), true},
-    {"-0x8000000000000001", GG_UINT64_C(0x7fffffffffffffff), true},
+    {"-0x8000000000000001", GG_UINT64_C(0x7fffffffffffffff), false},
     {"0xFFFFFFFFFFFFFFFF", kuint64max, true},
     {"FFFFFFFFFFFFFFFF", kuint64max, true},
     {"0x0000000000000000", 0, true},
     {"0000000000000000", 0, true},
     {"1FFFFFFFFFFFFFFFF", kuint64max, false}, // Overflow test.
     {"0x0f", 15, true},
     {"0f", 15, true},
     {" 45", 0x45, false},
     {"\t\n\v\f\r 0x45", 0x45, false},
     {" 45", 0x45, false},
     {"45 ", 0x45, false},
     {"45:", 0x45, false},
     {"efgh", 0xef, false},
     {"0xefgh", 0xef, false},
     {"hgfe", 0, false},
     {"-", 0, false},
     {"", 0, false},
     {"0x", 0, false},
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) {
     uint64 output = 0;
-    EXPECT_EQ(cases[i].success, HexStringToUInt64(cases[i].input, &output));
-    EXPECT_EQ(cases[i].output, output);
+
+    bool rv = HexStringToUInt64(cases[i].input, &output);
+    EXPECT_TRUE(rv == cases[i].success);
+    if (rv) {
+      EXPECT_EQ(cases[i].output, output);
+    }
   }
   // One additional test to verify that conversion of numbers in strings with
   // embedded NUL characters.  The NUL and extra data after it should be
   // interpreted as junk after the number.
   const char input[] = "0xc0ffee\09";
   std::string input_string(input, arraysize(input) - 1);
   uint64 output;
   EXPECT_FALSE(HexStringToUInt64(input_string, &output));
   EXPECT_EQ(0xc0ffeeU, output);
 }
@@ skipping 122 matching lines @@
 
 TEST(StringNumberConversionsTest, HexEncode) {
   std::string hex(HexEncode(NULL, 0));
   EXPECT_EQ(hex.length(), 0U);
   unsigned char bytes[] = {0x01, 0xff, 0x02, 0xfe, 0x03, 0x80, 0x81};
   hex = HexEncode(bytes, sizeof(bytes));
   EXPECT_EQ(hex.compare("01FF02FE038081"), 0);
 }
 
 }  // namespace base