diff options
| -rw-r--r-- | winsup/cygwin/release/3.1.0 | 3 | ||||
| -rw-r--r-- | winsup/cygwin/sigproc.cc | 9 |
2 files changed, 10 insertions, 2 deletions
diff --git a/winsup/cygwin/release/3.1.0 b/winsup/cygwin/release/3.1.0 index c8fe5556e..3b73a1802 100644 --- a/winsup/cygwin/release/3.1.0 +++ b/winsup/cygwin/release/3.1.0 @@ -37,3 +37,6 @@ Bug Fixes - Fix a timerfd deadlock. Addresses: https://cygwin.com/ml/cygwin/2019-06/msg00096.html + +- Fix sigpending() incorrectly returning signals for unrelated threads. + Addresses: https://cygwin.com/ml/cygwin/2019-07/msg00051.html diff --git a/winsup/cygwin/sigproc.cc b/winsup/cygwin/sigproc.cc index cba1af785..900facd58 100644 --- a/winsup/cygwin/sigproc.cc +++ b/winsup/cygwin/sigproc.cc @@ -1335,8 +1335,13 @@ wait_sig (VOID *) *pack.mask = 0; tl_entry = cygheap->find_tls (pack.sigtls); while ((q = q->next)) - if (pack.sigtls->sigmask & (bit = SIGTOMASK (q->si.si_signo))) - *pack.mask |= bit; + { + /* Skip thread-specific signals for other threads. */ + if (q->sigtls && pack.sigtls != q->sigtls) + continue; + if (pack.sigtls->sigmask & (bit = SIGTOMASK (q->si.si_signo))) + *pack.mask |= bit; + } cygheap->unlock_tls (tl_entry); } break; |