diff options
-rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
-rw-r--r-- | winsup/cygwin/sigproc.cc | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index ffa30dd59..f0715cc8b 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,10 @@ 2014-03-09 Christopher Faylor <me.cygwin2014@cgf.cx> + * sigproc.cc (_cygtls::remove_wq): Reset thread_ev inside of lock. Set + to NULL when done. + +2014-03-09 Christopher Faylor <me.cygwin2014@cgf.cx> + * fhandler_console.cc (fhandler_console::char_command): Properly use calculated value rather than directly using dev_state.args[0]. diff --git a/winsup/cygwin/sigproc.cc b/winsup/cygwin/sigproc.cc index 71b407d28..5525271ca 100644 --- a/winsup/cygwin/sigproc.cc +++ b/winsup/cygwin/sigproc.cc @@ -336,6 +336,8 @@ _cygtls::remove_wq (DWORD wait) if (exit_state < ES_FINAL && waitq_head.next && sync_proc_subproc && sync_proc_subproc.acquire (wait)) { + ForceCloseHandle1 (wq.thread_ev, wq_ev); + wq.thread_ev = NULL; for (waitq *w = &waitq_head; w->next != NULL; w = w->next) if (w->next == &wq) { @@ -344,7 +346,6 @@ _cygtls::remove_wq (DWORD wait) } sync_proc_subproc.release (); } - ForceCloseHandle1 (wq.thread_ev, wq_ev); } } |