* spawn.cc (spawn_guts): Fix so that cygthread::terminate is *really* calledunlabeled-1.13.4

only for exec.
* cygthread.cc (cygthread::stub): Don't zero __name here.  That introduces a
race.

1 files changed, 13 insertions, 8 deletions

diff --git a/winsup/cygwin/cygthread.cc b/winsup/cygwin/cygthread.cc
index ec217b792..ce64a746c 100644
--- a/winsup/cygwin/cygthread.cc
+++ b/winsup/cygwin/cygthread.cc
@@ -44,21 +44,26 @@ cygthread::stub (VOID *arg)
     }
   while (1)
     {
-      if (!info->func || initialized < 0)
-	ExitThread (0);
+      if (!info->__name)
+	system_printf ("errnoneous thread activation");
+      else
+	{
+	  if (!info->func || initialized < 0)
+	    ExitThread (0);
 
-      /* Cygwin threads should not call ExitThread directly */
-      info->func (info->arg == cygself ? info : info->arg);
-      /* ...so the above should always return */
+	  /* Cygwin threads should not call ExitThread directly */
+	  info->func (info->arg == cygself ? info : info->arg);
+	  /* ...so the above should always return */
 
 #ifdef DEBUGGING
-      info->func = NULL;	// catch erroneous activation
+	  info->func = NULL;	// catch erroneous activation
 #endif
-      SetEvent (info->ev);
-      info->__name = NULL;
+	  SetEvent (info->ev);
+	}
       switch (WaitForSingleObject (info->thread_sync, INFINITE))
 	{
 	case WAIT_OBJECT_0:
+	  // ResetEvent (info->thread_sync);
 	  continue;
 	default:
 	  api_fatal ("WFSO failed, %E");