From 24c56e5a2c4d5b0970252fccdff327f2480ca024 Mon Sep 17 00:00:00 2001
From: Ken Brown <kbrown@cornell.edu>
Date: Sat, 20 Apr 2019 11:22:29 -0400
Subject: [PATCH] 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.
---
 winsup/cygwin/fhandler_fifo.cc | 12 +++++++-----
 1 file 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;