commit 6897b7b8b95beae120fd53e6fd15921d6420bea7
author Dmitriy Ivanov <dimitry@google.com> Wed May 14 21:02:17 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 14 21:02:18 2014 +0000
tree 7d0da1ce701c7dac1a59e1eda1fc2616306e9bbb
parent fbd9dcadc8e25b22c99596462669017b9b1b4a7c
parent 1079406cab09090cc11e26d4ac2f1ba9c4930cdb

Merge "Fix for linker allocator"

linker/linker_allocator.cpp

diff --git a/linker/linker_allocator.cpp b/linker/linker_allocator.cpp
index 60ce1ea..5738090 100644
--- a/linker/linker_allocator.cpp
+++ b/linker/linker_allocator.cpp
@@ -117,8 +117,8 @@
   }
 
   LinkerAllocatorPage* page = page_list_;
-  const uint8_t* page_ptr = reinterpret_cast<const uint8_t*>(page);
   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)) {
       return page;
     }

linker/tests/linker_allocator_test.cpp

diff --git a/linker/tests/linker_allocator_test.cpp b/linker/tests/linker_allocator_test.cpp
index e3a91c5..0ed8252 100644
--- a/linker/tests/linker_allocator_test.cpp
+++ b/linker/tests/linker_allocator_test.cpp
@@ -96,6 +96,9 @@
     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() {