diff options
author | Ken Brown <kbrown@cornell.edu> | 2019-04-20 11:22:29 -0400 |
---|---|---|
committer | Ken Brown <kbrown@cornell.edu> | 2019-04-20 14:31:07 -0400 |
commit | 24c56e5a2c4d5b0970252fccdff327f2480ca024 (patch) | |
tree | d113d585f55863beef36837b5162455b63d70fd0 | |
parent | ef269531a96b649ae27395f272cf95aa2c7062fa (diff) | |
download | cygnal-24c56e5a2c4d5b0970252fccdff327f2480ca024.tar.gz cygnal-24c56e5a2c4d5b0970252fccdff327f2480ca024.tar.bz2 cygnal-24c56e5a2c4d5b0970252fccdff327f2480ca024.zip |
Cygwin: FIFO: avoid WFMO error in listen_client_thread
Don't set lct_termination_evt to NULL too early in
fhandler_fifo::stop_listen_client. Doing so leads to an "Invalid
Handle" error in WFMO.
-rw-r--r-- | winsup/cygwin/fhandler_fifo.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/winsup/cygwin/fhandler_fifo.cc b/winsup/cygwin/fhandler_fifo.cc index 0a6dc0591..0e4bf3aee 100644 --- a/winsup/cygwin/fhandler_fifo.cc +++ b/winsup/cygwin/fhandler_fifo.cc @@ -844,22 +844,24 @@ int fhandler_fifo::stop_listen_client () { int ret = 0; - HANDLE evt = InterlockedExchangePointer (&lct_termination_evt, NULL); - HANDLE thr = InterlockedExchangePointer (&listen_client_thr, NULL); + HANDLE thr, evt; + + thr = InterlockedExchangePointer (&listen_client_thr, NULL); if (thr) { - if (evt) - SetEvent (evt); + if (lct_termination_evt) + SetEvent (lct_termination_evt); WaitForSingleObject (thr, INFINITE); DWORD err; GetExitCodeThread (thr, &err); if (err) { ret = -1; - debug_printf ("listen_client_thread exited with error, %E"); + debug_printf ("listen_client_thread exited with error"); } CloseHandle (thr); } + evt = InterlockedExchangePointer (&lct_termination_evt, NULL); if (evt) CloseHandle (evt); return ret; |