ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix some memory leaks, potential errors."

Browse source
This commit is contained in:
Christopher Ferris 2017-06-20 18:29:22 +00:00 • committed by Gerrit Code Review
commit 9d239ec6a5
3 changed files with 23 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
libunwindstack/Maps.cpp
View file

@ -71,15 +71,17 @@ bool Maps::ParseLine(const char* line, MapInfo* map_info) {
map_info->flags |= PROT_EXEC; map_info->flags |= PROT_EXEC;
} }
map_info->name = &line[name_pos]; if (line[name_pos] != '\0') {
size_t length = map_info->name.length() - 1; map_info->name = &line[name_pos];
if (map_info->name[length] == '\n') { size_t length = map_info->name.length() - 1;
map_info->name.erase(length); if (map_info->name[length] == '\n') {
} map_info->name.erase(length);
// Mark a device map in /dev/and not in /dev/ashmem/ specially. }
if (!map_info->name.empty() && map_info->name.substr(0, 5) == "/dev/" &&
map_info->name.substr(5, 7) != "ashmem/") { // Mark a device map in /dev/and not in /dev/ashmem/ specially.
map_info->flags |= MAPS_FLAGS_DEVICE_MAP; if (map_info->name.substr(0, 5) == "/dev/" && map_info->name.substr(5, 7) != "ashmem/") {
map_info->flags |= MAPS_FLAGS_DEVICE_MAP;
}
} }
return true; return true;

6
libunwindstack/tests/MapInfoTest.cpp
View file

@ -75,7 +75,7 @@ TEST_F(MapInfoTest, end_le_start) {
// Make sure this test is valid. // Make sure this test is valid.
info.end = 0x101; info.end = 0x101;
memory.reset(info.CreateMemory(getpid())); memory.reset(info.CreateMemory(getpid()));
ASSERT_FALSE(info.CreateMemory(getpid()) == nullptr); ASSERT_TRUE(memory.get() != nullptr);
} }
// Verify that if the offset is non-zero but there is no elf at the offset, // Verify that if the offset is non-zero but there is no elf at the offset,
@ -212,8 +212,8 @@ TEST_F(MapInfoTest, get_elf) {
MapInfo info{.start = start, .end = start + 1024, .offset = 0, .name = ""}; MapInfo info{.start = start, .end = start + 1024, .offset = 0, .name = ""};
// The map contains garbage, but this should still produce an elf object. // The map contains garbage, but this should still produce an elf object.
Elf* elf = info.GetElf(getpid(), false); std::unique_ptr<Elf> elf(info.GetElf(getpid(), false));
ASSERT_TRUE(elf != nullptr); ASSERT_TRUE(elf.get() != nullptr);
ASSERT_FALSE(elf->valid()); ASSERT_FALSE(elf->valid());
ASSERT_EQ(0, munmap(map, 1024)); ASSERT_EQ(0, munmap(map, 1024));

25
libunwindstack/tests/MemoryRangeTest.cpp
View file

@ -26,21 +26,13 @@
#include "MemoryFake.h" #include "MemoryFake.h"
class MemoryRangeTest : public ::testing::Test { TEST(MemoryRangeTest, read) {
protected:
void SetUp() override {
memory_ = new MemoryFake;
}
MemoryFake* memory_;
};
TEST_F(MemoryRangeTest, read) {
std::vector<uint8_t> src(1024); std::vector<uint8_t> src(1024);
memset(src.data(), 0x4c, 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); std::vector<uint8_t> dst(1024);
ASSERT_TRUE(range.Read(0, dst.data(), src.size())); 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); std::vector<uint8_t> src(4096);
memset(src.data(), 0x4c, 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); std::vector<uint8_t> dst(1024);
ASSERT_TRUE(range.Read(1020, dst.data(), 4)); 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)); ASSERT_TRUE(range.Read(1020, dst.data(), 4));
} }
TEST_F(MemoryRangeTest, read_overflow) { TEST(MemoryRangeTest, read_overflow) {
std::vector<uint8_t> buffer(100); std::vector<uint8_t> buffer(100);
std::unique_ptr<MemoryRange> overflow(new MemoryRange(new MemoryFakeAlwaysReadZero, 100, 200)); std::unique_ptr<MemoryRange> overflow(new MemoryRange(new MemoryFakeAlwaysReadZero, 100, 200));