summaryrefslogtreecommitdiffstats
path: root/sigchainlib
diff options
context:
space:
mode:
authorDave Allison <dallison@google.com>2014-08-20 17:38:41 -0700
committerDave Allison <dallison@google.com>2014-08-21 12:04:02 -0700
commit1f8ef6fa2fb5d79799371f8bf745824b78bc48f2 (patch)
tree0ecf06cfc561501ad65ad774848ce2f30808c123 /sigchainlib
parent00b3024b350afef115bddea712705bdb4877ac11 (diff)
downloadart-1f8ef6fa2fb5d79799371f8bf745824b78bc48f2.zip
art-1f8ef6fa2fb5d79799371f8bf745824b78bc48f2.tar.gz
art-1f8ef6fa2fb5d79799371f8bf745824b78bc48f2.tar.bz2
Fix fault handler to unregister on shutdown
This fixes a problem with the fault handler where it wasn't unregistering itself during shutdown of the runtime. Bug: 17133266 (cherry picked from commit e8b9afcd0cd86b8808af29a97332038aab70c604) Change-Id: I1a4ec4292ec049046dda30769265680201729efb
Diffstat (limited to 'sigchainlib')
-rw-r--r--sigchainlib/sigchain.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sigchainlib/sigchain.cc b/sigchainlib/sigchain.cc
index 6f93083..2ba7405 100644
--- a/sigchainlib/sigchain.cc
+++ b/sigchainlib/sigchain.cc
@@ -45,8 +45,8 @@ class SignalAction {
// Unclaim the signal and restore the old action.
void Unclaim(int signal) {
- claimed_ = false;
sigaction(signal, &action_, NULL); // Restore old action.
+ claimed_ = false;
}
// Get the action associated with this signal.
@@ -164,7 +164,6 @@ int sigaction(int signal, const struct sigaction* new_action, struct sigaction*
return linked_sigaction(signal, new_action, old_action);
}
-
int sigprocmask(int how, const sigset_t* bionic_new_set, sigset_t* bionic_old_set) {
const sigset_t* new_set_ptr = bionic_new_set;
sigset_t tmpset;