Fix for issue 222001.

git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@725 4c0a9323-5329-0410-9bdc-e9ce6186880e

src/processor/map_serializers_unittest.cc

@@ -131,7 +131,7 @@ class TestAddressMapSerializer : public ::testing::Test {
   }
 
   void TearDown() {
-    delete serialized_data_;
+    delete [] serialized_data_;
   }
 
   google_breakpad::AddressMap<AddrType, EntryType> address_map_;
@@ -206,7 +206,7 @@ class TestRangeMapSerializer : public ::testing::Test {
   }
 
   void TearDown() {
-    delete serialized_data_;
+    delete [] serialized_data_;
   }
 
   google_breakpad::RangeMap<AddrType, EntryType> range_map_;
@@ -279,7 +279,7 @@ class TestContainedRangeMapSerializer : public ::testing::Test {
   }
 
   void TearDown() {
-    delete serialized_data_;
+    delete [] serialized_data_;
   }
 
   google_breakpad::ContainedRangeMap<AddrType, EntryType> crm_map_;

src/processor/static_address_map_unittest.cc

@@ -84,7 +84,7 @@ class TestStaticAddressMap : public ::testing::Test {
 
   void TearDown() {
     for (int i = 0; i < kNumberTestCases; ++i) {
-      delete map_data[i];
+      delete [] map_data[i];
       delete [] testdata[i];
     }
   }

src/processor/static_contained_range_map_unittest.cc

@@ -42,9 +42,13 @@
 #include "processor/logging.h"
 
 namespace {
-  // Each element in test_data contains the expected result when calling
+
-  // RetrieveRange on an address.
+typedef google_breakpad::ContainedRangeMap<unsigned int, int> CRMMap;
-  const int test_data[] = {
+typedef google_breakpad::StaticContainedRangeMap<unsigned int, int> TestMap;
+
+// Each element in test_data contains the expected result when calling
+// RetrieveRange on an address.
+const int test_data[] = {
   0,   // 0
   0,   // 1
   0,   // 2
@@ -145,13 +149,11 @@ namespace {
   0,   // 97
   0,   // 98
   0    // 99
-  };
+};
+
 }  // namespace
 
-
+namespace google_breakpad {
-typedef google_breakpad::ContainedRangeMap<unsigned int, int> CRMMap;
-typedef google_breakpad::StaticContainedRangeMap<unsigned int, int> TestMap;
-using google_breakpad::scoped_ptr;
 
 class TestStaticCRMMap : public ::testing::Test {
  protected:
@@ -167,7 +169,7 @@ class TestStaticCRMMap : public ::testing::Test {
 
   google_breakpad::ContainedRangeMapSerializer<unsigned int, int> serializer_;
 
-  scoped_ptr<char> serialized_data_;
+  scoped_array<char> serialized_data_;
 };
 
 void TestStaticCRMMap::SetUp() {
@@ -236,7 +238,7 @@ TEST_F(TestStaticCRMMap, TestEmptyMap) {
   CRMMap empty_crm_map;
 
   unsigned int size;
-  scoped_ptr<char> serialized_data;
+  scoped_array<char> serialized_data;
   serialized_data.reset(serializer_.Serialize(&empty_crm_map, &size));
   scoped_ptr<TestMap> test_map(new TestMap(serialized_data.get()));
 
@@ -256,7 +258,7 @@ TEST_F(TestStaticCRMMap, TestSingleElementMap) {
   crm_map.StoreRange(10, 10,  entry);
 
   unsigned int size;
-  scoped_ptr<char> serialized_data;
+  scoped_array<char> serialized_data;
   serialized_data.reset(serializer_.Serialize(&crm_map, &size));
   scoped_ptr<TestMap> test_map(new TestMap(serialized_data.get()));
 
@@ -310,6 +312,8 @@ TEST_F(TestStaticCRMMap, RunTestData) {
 #endif  // GENERATE_TEST_DATA
 }
 
+}  // namespace google_breakpad
+
 int main(int argc, char *argv[]) {
   ::testing::InitGoogleTest(&argc, argv);
 

src/processor/static_range_map_unittest.cc

@@ -40,14 +40,12 @@
 #include "processor/logging.h"
 #include "processor/scoped_ptr.h"
 
-using google_breakpad::StaticRangeMap;
+namespace {
-using google_breakpad::RangeMap;
-
 // Types used for testing.
 typedef int AddressType;
 typedef int EntryType;
-typedef StaticRangeMap< AddressType, EntryType > TestMap;
+typedef google_breakpad::StaticRangeMap< AddressType, EntryType > TestMap;
-typedef RangeMap< AddressType, EntryType > RMap;
+typedef google_breakpad::RangeMap< AddressType, EntryType > RMap;
 
 // RangeTest contains data to use for store and retrieve tests.  See
 // RunTests for descriptions of the tests.
@@ -75,10 +73,9 @@ struct RangeTestSet {
   unsigned int range_test_count;
 };
 
-namespace {
+// These tests will be run sequentially.  The first set of tests exercises
-  // These tests will be run sequentially.  The first set of tests exercises
+// most functions of RangeTest, and verifies all of the bounds-checking.
-  // most functions of RangeTest, and verifies all of the bounds-checking.
+const RangeTest range_tests_0[] = {
-  const RangeTest range_tests_0[] = {
   { INT_MIN,     16,      1,  true },   // lowest possible range
   { -2,          5,       2,  true },   // a range through zero
   { INT_MAX - 9, 11,      3,  false },  // tests anti-overflow
@@ -118,15 +115,15 @@ namespace {
   { 0x10001,     0x10001, 35, true },   // > 16-bit
 
   { 27,          -1,      36, false }   // tests high < base
-  };
+};
 
-  // Attempt to fill the entire space.  The entire space must be filled with
+// Attempt to fill the entire space.  The entire space must be filled with
-  // three stores because AddressType is signed for these tests, so RangeMap
+// three stores because AddressType is signed for these tests, so RangeMap
-  // treats the size as signed and rejects sizes that appear to be negative.
+// treats the size as signed and rejects sizes that appear to be negative.
-  // Even if these tests were run as unsigned, two stores would be needed
+// Even if these tests were run as unsigned, two stores would be needed
-  // to fill the space because the entire size of the space could only be
+// to fill the space because the entire size of the space could only be
-  // described by using one more bit than would be present in AddressType.
+// described by using one more bit than would be present in AddressType.
-  const RangeTest range_tests_1[] = {
+const RangeTest range_tests_1[] = {
   { INT_MIN, INT_MAX, 50, true },   // From INT_MIN to -2, inclusive
   { -1,      2,       51, true },   // From -1 to 0, inclusive
   { 1,       INT_MAX, 52, true },   // From 1 to INT_MAX, inclusive
@@ -134,37 +131,39 @@ namespace {
   { -1,      2,       54, false },
   { 1,       INT_MAX, 55, false },
   { -3,      6,       56, false },  // -3 to 2, inclusive - spans 3 ranges
-  };
+};
 
-  // A light round of testing to verify that RetrieveRange does the right
+// A light round of testing to verify that RetrieveRange does the right
-  // the right thing at the extremities of the range when nothing is stored
+// the right thing at the extremities of the range when nothing is stored
-  // there.  Checks are forced without storing anything at the extremities
+// there.  Checks are forced without storing anything at the extremities
-  // by setting size = 0.
+// by setting size = 0.
-  const RangeTest range_tests_2[] = {
+const RangeTest range_tests_2[] = {
   { INT_MIN, 0, 100, false },  // makes RetrieveRange check low end
   { -1,      3, 101, true },
   { INT_MAX, 0, 102, false },  // makes RetrieveRange check high end
-  };
+};
 
-  // Similar to the previous test set, but with a couple of ranges closer
+// Similar to the previous test set, but with a couple of ranges closer
-  // to the extremities.
+// to the extremities.
-  const RangeTest range_tests_3[] = {
+const RangeTest range_tests_3[] = {
   { INT_MIN + 1, 1, 110, true },
   { INT_MAX - 1, 1, 111, true },
   { INT_MIN,     0, 112, false },  // makes RetrieveRange check low end
   { INT_MAX,     0, 113, false }   // makes RetrieveRange check high end
-  };
+};
 
-  // The range map is cleared between sets of tests listed here.
+// The range map is cleared between sets of tests listed here.
-  const RangeTestSet range_test_sets[] = {
+const RangeTestSet range_test_sets[] = {
   { range_tests_0, sizeof(range_tests_0) / sizeof(RangeTest) },
   { range_tests_1, sizeof(range_tests_1) / sizeof(RangeTest) },
   { range_tests_2, sizeof(range_tests_2) / sizeof(RangeTest) },
   { range_tests_3, sizeof(range_tests_3) / sizeof(RangeTest) },
   { range_tests_0, sizeof(range_tests_0) / sizeof(RangeTest) }   // Run again
-  };
+};
-}
 
+}  // namespace
+
+namespace google_breakpad {
 class TestStaticRangeMap : public ::testing::Test {
  protected:
   void SetUp() {
@@ -194,7 +193,7 @@ class TestStaticRangeMap : public ::testing::Test {
   void RunTestCase(int test_case);
 
   unsigned int kTestCasesCount_;
-  google_breakpad::RangeMapSerializer<AddressType, EntryType> serializer_;
+  RangeMapSerializer<AddressType, EntryType> serializer_;
 };
 
 void TestStaticRangeMap::StoreTest(RMap* range_map,
@@ -353,7 +352,7 @@ void TestStaticRangeMap::RetrieveIndexTest(const TestMap* range_map, int set) {
 void TestStaticRangeMap::RunTestCase(int test_case) {
   // Maintain the range map in a pointer so that deletion can be meaningfully
   // tested.
-  RMap* rmap = new RMap();
+  scoped_ptr<RMap> rmap(new RMap());
 
   const RangeTest* range_tests = range_test_sets[test_case].range_tests;
   unsigned int range_test_count = range_test_sets[test_case].range_test_count;
@@ -365,14 +364,14 @@ void TestStaticRangeMap::RunTestCase(int test_case) {
        range_test_index < range_test_count;
        ++range_test_index) {
     const RangeTest* range_test = &range_tests[range_test_index];
-    StoreTest(rmap, range_test);
+    StoreTest(rmap.get(), range_test);
 
     if (range_test->expect_storable)
       ++stored_count;
   }
 
-  char *memaddr = serializer_.Serialize(*rmap, NULL);
+  scoped_array<char> memaddr(serializer_.Serialize(*rmap, NULL));
-  TestMap* static_range_map = new TestMap(memaddr);
+  scoped_ptr<TestMap> static_range_map(new TestMap(memaddr.get()));
 
   // The RangeMap's own count of objects should also match.
   EXPECT_EQ(static_range_map->GetCount(), stored_count);
@@ -382,17 +381,10 @@ void TestStaticRangeMap::RunTestCase(int test_case) {
        range_test_index < range_test_count;
        ++range_test_index) {
     const RangeTest* range_test = &range_tests[range_test_index];
-    RetrieveTest(static_range_map, range_test);
+    RetrieveTest(static_range_map.get(), range_test);
   }
 
-  RetrieveIndexTest(static_range_map, test_case);
+  RetrieveIndexTest(static_range_map.get(), test_case);
-
-  // Clear the map between test sets.  If this is the final test set,
-  // delete the map instead to test destruction.
-  delete memaddr;
-  delete static_range_map;
-  rmap->Clear();
-  delete rmap;
 }
 
 TEST_F(TestStaticRangeMap, TestCase0) {
@@ -420,6 +412,8 @@ TEST_F(TestStaticRangeMap, RunTestCase0Again) {
   RunTestCase(test_case);
 }
 
+}  // namespace google_breakpad
+
 int main(int argc, char *argv[]) {
   ::testing::InitGoogleTest(&argc, argv);