diff options
author | Christopher Ferris <cferris@google.com> | 2017-06-19 13:42:04 -0700 |
---|---|---|
committer | Christopher Ferris <cferris@google.com> | 2017-06-19 16:20:33 -0700 |
commit | 051792fed4ce3fcbfb8f2c8e86bd50e959fe14ca (patch) | |
tree | 7a0b4848ae3b5e87c453784352dd5d9a0f70eccd /libunwindstack/tests/MemoryRangeTest.cpp | |
parent | ad4aa9e169529615ba7c74b942aaee53a1425a78 (diff) |
Fix some memory leaks, potential errors.
Fix a couple of memory leaks in tests.
Fix a potential case that length could be zero.
Bug: 23762183
Test: Ran unit tests, then ran valgrind on unit tests and verified no leaks.
Change-Id: I5f7602aa0204db0488a8e305250658cdb6e977d0
Diffstat (limited to 'libunwindstack/tests/MemoryRangeTest.cpp')
-rw-r--r-- | libunwindstack/tests/MemoryRangeTest.cpp | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/libunwindstack/tests/MemoryRangeTest.cpp b/libunwindstack/tests/MemoryRangeTest.cpp index ee5ba018b..469afcce1 100644 --- a/libunwindstack/tests/MemoryRangeTest.cpp +++ b/libunwindstack/tests/MemoryRangeTest.cpp @@ -26,21 +26,13 @@ #include "MemoryFake.h" -class MemoryRangeTest : public ::testing::Test { - protected: - void SetUp() override { - memory_ = new MemoryFake; - } - - MemoryFake* memory_; -}; - -TEST_F(MemoryRangeTest, read) { +TEST(MemoryRangeTest, read) { std::vector<uint8_t> src(1024); memset(src.data(), 0x4c, 1024); - memory_->SetMemory(9001, src); + MemoryFake* memory = new MemoryFake; + memory->SetMemory(9001, src); - MemoryRange range(memory_, 9001, 9001 + src.size()); + MemoryRange range(memory, 9001, 9001 + src.size()); std::vector<uint8_t> dst(1024); ASSERT_TRUE(range.Read(0, dst.data(), src.size())); @@ -49,12 +41,13 @@ TEST_F(MemoryRangeTest, read) { } } -TEST_F(MemoryRangeTest, read_near_limit) { +TEST(MemoryRangeTest, read_near_limit) { std::vector<uint8_t> src(4096); memset(src.data(), 0x4c, 4096); - memory_->SetMemory(1000, src); + MemoryFake* memory = new MemoryFake; + memory->SetMemory(1000, src); - MemoryRange range(memory_, 1000, 2024); + MemoryRange range(memory, 1000, 2024); std::vector<uint8_t> dst(1024); ASSERT_TRUE(range.Read(1020, dst.data(), 4)); @@ -71,7 +64,7 @@ TEST_F(MemoryRangeTest, read_near_limit) { ASSERT_TRUE(range.Read(1020, dst.data(), 4)); } -TEST_F(MemoryRangeTest, read_overflow) { +TEST(MemoryRangeTest, read_overflow) { std::vector<uint8_t> buffer(100); std::unique_ptr<MemoryRange> overflow(new MemoryRange(new MemoryFakeAlwaysReadZero, 100, 200)); |