summaryrefslogtreecommitdiff
path: root/runtime/fault_handler.cc
diff options
context:
space:
mode:
author Andreas Gampe <agampe@google.com> 2016-04-18 17:15:42 -0700
committer Andreas Gampe <agampe@google.com> 2016-04-18 17:15:42 -0700
commitd14b73d9d9027539c1dfeff93f784a58c93f4e32 (patch)
treefb5393c75ea2342c0444a80c00141888579fd9d9 /runtime/fault_handler.cc
parentc4d445a40bf00ab497b5e4d43a6b43eaafb5fa50 (diff)
ART: Fast-fail empty other handlers in fault handling
Don't try to set up the nested handler environment if there are no other handlers installed. Stop-gap for the current setup without other handlers. There are a myriad more issues before we can safely re-enable other handlers. Bug: 28245957 Change-Id: I526aef82aa1ca2b6c4b1959858fe76231bc067d9
Diffstat (limited to 'runtime/fault_handler.cc')
-rw-r--r--runtime/fault_handler.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/runtime/fault_handler.cc b/runtime/fault_handler.cc
index 5c5abeb0a6..9f073a63a8 100644
--- a/runtime/fault_handler.cc
+++ b/runtime/fault_handler.cc
@@ -147,6 +147,10 @@ void FaultManager::Shutdown() {
}
bool FaultManager::HandleFaultByOtherHandlers(int sig, siginfo_t* info, void* context) {
+ if (other_handlers_.empty()) {
+ return false;
+ }
+
Thread* self = Thread::Current();
DCHECK(self != nullptr);