generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 283ec625: am 6897b7b8: Merge "Fix for linker allocator"

Browse Source 
* commit '283ec6256bdde5685f224efdc67a061cc611b33a':
  Fix for linker allocator
This commit is contained in:
Dmitriy Ivanov 2014-05-14 21:07:21 +00:00 committed by Android Git Automerger
commit 3d80e36a85
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linker/linker_allocator.cpp
View File

@ -117,8 +117,8 @@ LinkerAllocatorPage* LinkerBlockAllocator::find_page(void* block) {
} }
LinkerAllocatorPage* page = page_list_; LinkerAllocatorPage* page = page_list_;
const uint8_t* page_ptr = reinterpret_cast<const uint8_t*>(page);
while (page != nullptr) { while (page != nullptr) {
const uint8_t* page_ptr = reinterpret_cast<const uint8_t*>(page);
if (block >= (page_ptr + sizeof(page->next)) && block < (page_ptr + PAGE_SIZE)) { if (block >= (page_ptr + sizeof(page->next)) && block < (page_ptr + PAGE_SIZE)) {
return page; return page;
} }

3
linker/tests/linker_allocator_test.cpp
View File

@ -96,6 +96,9 @@ TEST(linker_allocator, test_larger) {
ASSERT_TRUE(allocator.alloc() != nullptr); ASSERT_TRUE(allocator.alloc() != nullptr);
} }
test_struct_larger* ptr_to_free = allocator.alloc();
ASSERT_TRUE(ptr_to_free != nullptr);
allocator.free(ptr1);
} }
static void protect_all() { static void protect_all() {