commit 48cedda02a9874d59b2b3652d0427abce7fedaab
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jul 14 00:22:34 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 14 00:22:34 2016 +0000
tree 5c65eb76505c0940d6bb37ada5e94a61ee946890
parent cc55bd831318d485dcf04149d423d91756379153
parent 3a6c6b3254b2033a9a0246013a2c8b486800624b

Merge "Fix dlext.ns_smoke test"

linker/linker_allocator.cpp

diff --git a/linker/linker_allocator.cpp b/linker/linker_allocator.cpp
index 57811d8..7deddea 100644
--- a/linker/linker_allocator.cpp
+++ b/linker/linker_allocator.cpp
@@ -15,6 +15,7 @@
  */
 
 #include "linker_allocator.h"
+#include "linker_debug.h"
 #include "linker.h"
 
 #include <algorithm>
@@ -73,6 +74,8 @@
     : type_(0), block_size_(0), free_pages_cnt_(0), free_blocks_list_(nullptr) {}
 
 void* LinkerSmallObjectAllocator::alloc() {
+  CHECK(block_size_ != 0);
+
   if (free_blocks_list_ == nullptr) {
     alloc_page();
   }

linker/linker_logger.cpp

diff --git a/linker/linker_logger.cpp b/linker/linker_logger.cpp
index 7499a83..78f14d4 100644
--- a/linker/linker_logger.cpp
+++ b/linker/linker_logger.cpp
@@ -41,7 +41,7 @@
 LinkerLogger g_linker_logger;
 
 static const char* kSystemLdDebugProperty = "debug.ld.all";
-static const std::string kLdDebugPropertyPrefix = "debug.ld.app.";
+static const char* kLdDebugPropertyPrefix = "debug.ld.app.";
 
 static const char* kOptionErrors = "dlerror";
 static const char* kOptionDlopen = "dlopen";