From 6e88ef6b604a7a945a466784580c42e6554c1289 Mon Sep 17 00:00:00 2001
From: Mathieu Chartier <mathieuc@google.com>
Date: Tue, 14 Oct 2014 15:01:24 -0700
Subject: Change MemMap::maps_ to not be global variable

Runtime.exit() was causing globals to get destructed at the same time
that another thread was using it for allocating a new mem map.

Bug: 17962201
Change-Id: I400cb7b8141d858f3c08a6fe59a02838c04c6962
---
 patchoat/patchoat.cc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'patchoat/patchoat.cc')

diff --git a/patchoat/patchoat.cc b/patchoat/patchoat.cc
index 4ed428c20..504addc05 100644
--- a/patchoat/patchoat.cc
+++ b/patchoat/patchoat.cc
@@ -758,6 +758,7 @@ static File* CreateOrOpen(const char* name, bool* created) {
 
 static int patchoat(int argc, char **argv) {
   InitLogging(argv);
+  MemMap::Init();
   const bool debug = kIsDebugBuild;
   orig_argc = argc;
   orig_argv = argv;
-- 
cgit v1.2.3