From 0f6290d6986fc9a9efb8b2b963fc154188c65cb1 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Thu, 5 Mar 2009 18:22:14 +0000 Subject: [PATCH] move some code to gracefully handle the case when a handler crashes. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@66171 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/System/Unix/Signals.inc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/System/Unix/Signals.inc b/lib/System/Unix/Signals.inc index ac0d982f4e5..f409cefcc35 100644 --- a/lib/System/Unix/Signals.inc +++ b/lib/System/Unix/Signals.inc @@ -57,6 +57,12 @@ static const int *const KillSigsEnd = // SignalHandler - The signal handler that runs... static RETSIGTYPE SignalHandler(int Sig) { + // Restore the signal behavior to default, so that the program actually + // crashes when we return and the signal reissues. This also ensures that if + // we crash in our signal handler that the program will terminate immediately + // instead of recursing in the signal handler. + signal(Sig, SIG_DFL); + if (FilesToRemove != 0) while (!FilesToRemove->empty()) { FilesToRemove->back().eraseFromDisk(true); @@ -77,10 +83,6 @@ static RETSIGTYPE SignalHandler(int Sig) { if (CallBacksToRun) for (unsigned i = 0, e = CallBacksToRun->size(); i != e; ++i) (*CallBacksToRun)[i].first((*CallBacksToRun)[i].second); - - // Restore the signal behavior to default, so that the program actually - // crashes when we return and the signal reissues. - signal(Sig, SIG_DFL); } // Just call signal -- 2.34.1