aboutsummaryrefslogtreecommitdiff
path: root/src/processor/static_range_map_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/processor/static_range_map_unittest.cc')
-rw-r--r--src/processor/static_range_map_unittest.cc15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/processor/static_range_map_unittest.cc b/src/processor/static_range_map_unittest.cc
index 28217362..3903e948 100644
--- a/src/processor/static_range_map_unittest.cc
+++ b/src/processor/static_range_map_unittest.cc
@@ -1,5 +1,4 @@
-// Copyright (c) 2010 Google Inc.
-// All rights reserved.
+// Copyright 2010 Google LLC
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
@@ -11,7 +10,7 @@
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
-// * Neither the name of Google Inc. nor the names of its
+// * Neither the name of Google LLC nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
@@ -228,10 +227,10 @@ void TestStaticRangeMap::RetrieveTest(TestMap* range_map,
}
for (AddressType offset = low_offset; offset <= high_offset; ++offset) {
- AddressType address =
- offset +
- (!side ? range_test->address :
- range_test->address + range_test->size - 1);
+ AddressType address = AddIgnoringOverflow(
+ offset, (!side ? range_test->address
+ : AddIgnoringOverflow(range_test->address,
+ range_test->size - 1)));
bool expected_result = false; // This is correct for tests not stored.
if (range_test->expect_storable) {
@@ -414,7 +413,7 @@ TEST_F(TestStaticRangeMap, RunTestCase0Again) {
} // namespace google_breakpad
-int main(int argc, char *argv[]) {
+int main(int argc, char* argv[]) {
::testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS();