commit c437f40e561cc00bc3c2d7f03e32b7a53d6b6992
author Josh Gao <jmgao@google.com> Tue Feb 07 20:49:39 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Feb 07 20:49:39 2017 +0000
tree c42054901237930737efe12ee0f06cb2b3c1654b
parent 7856cd6dbfd8302694d8d3dd815556405ffac9d2
parent 65e31b31b424a8dbe2b6be8aeed69ecddd13447d

Merge "crash_dump: read /proc/<pid>/maps before dropping capabilities." am: 59b8e35939 am: 2eefb47ae3
am: 257366f24e

Change-Id: I6930e7af154db0ed3b8bb045b6f517489594ca41

debuggerd/crash_dump.cpp

diff --git a/debuggerd/crash_dump.cpp b/debuggerd/crash_dump.cpp
index ed6d3b7..4e083ae 100644
--- a/debuggerd/crash_dump.cpp
+++ b/debuggerd/crash_dump.cpp
@@ -358,6 +358,11 @@
     }
   }
 
+  std::unique_ptr<BacktraceMap> backtrace_map(BacktraceMap::Create(main_tid));
+  if (!backtrace_map) {
+    LOG(FATAL) << "failed to create backtrace map";
+  }
+
   // Drop our capabilities now that we've attached to the threads we care about.
   drop_capabilities();
 
@@ -365,7 +370,6 @@
 
   // TODO: Use seccomp to lock ourselves down.
 
-  std::unique_ptr<BacktraceMap> backtrace_map(BacktraceMap::Create(main_tid));
   std::string amfd_data;
 
   if (backtrace) {