summaryrefslogtreecommitdiffstats
path: root/debuggerd
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2016-06-18 00:05:26 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-18 00:05:26 +0000
commite1eb2272d6b46b0c0d0c408d33d7c45430bd6999 (patch)
tree1dcbbdc41a6f14451d3edaf77afb9b425bfe6c3c /debuggerd
parent32cc6c99089033e96b7553e13073dc8b123935bf (diff)
parent863d8e11b9b62388d9d00d7192b5e6f39fa089fa (diff)
downloadsystem_core-e1eb2272d6b46b0c0d0c408d33d7c45430bd6999.tar.gz
system_core-e1eb2272d6b46b0c0d0c408d33d7c45430bd6999.tar.bz2
system_core-e1eb2272d6b46b0c0d0c408d33d7c45430bd6999.zip
Merge \"Fix race condition updating local map data.\"
am: 863d8e11b9 Change-Id: I00899ce500c2ae8bc58b6eb42c01d8688dd232c0
Diffstat (limited to 'debuggerd')
-rw-r--r--debuggerd/tombstone.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/debuggerd/tombstone.cpp b/debuggerd/tombstone.cpp
index fa983fa1f..dfdf29cdf 100644
--- a/debuggerd/tombstone.cpp
+++ b/debuggerd/tombstone.cpp
@@ -368,6 +368,7 @@ static void dump_all_maps(Backtrace* backtrace, BacktraceMap* map, log_t* log, p
ALOGE("Cannot get siginfo for %d: %s\n", tid, strerror(errno));
}
+ ScopedBacktraceMapIteratorLock lock(map);
_LOG(log, logtype::MAPS, "\n");
if (!print_fault_address_marker) {
_LOG(log, logtype::MAPS, "memory map:\n");