diff options
| -rw-r--r-- | winsup/cygwin/ChangeLog | 7 | ||||
| -rw-r--r-- | winsup/cygwin/exceptions.cc | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index d44ab542a..b3f389249 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,10 @@ +2009-09-19 Christopher Faylor <me+cygwin@cgf.cx> + + * exceptions.cc (sigpacket::process): Explicitly set thread-specific + handler function to zero to avoid transferring to incorrect location. + (_cygtls::call_signal_handler): Don't transfer to handler if there is + no handler to transfer to. + 2009-09-18 Christopher Faylor <me+cygwin@cgf.cx> * exceptions.cc (sigpacket::process): Give sigwait() processing diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc index a66644cc7..9d8de7570 100644 --- a/winsup/cygwin/exceptions.cc +++ b/winsup/cygwin/exceptions.cc @@ -1298,6 +1298,7 @@ done: thread_specific: use_tls->sig = si.si_signo; use_tls->set_siginfo (this); + use_tls->func = NULL; sigproc_printf ("releasing sigwait for thread"); SetEvent (use_tls->event); goto done; @@ -1374,7 +1375,7 @@ _cygtls::call_signal_handler () { int this_sa_flags = 0; /* Call signal handler. */ - while (sig) + while (sig && func) { lock (); this_sa_flags = sa_flags; |