* spawn.cc (spawn_guts): Move system signal handling stuff after CreateProcess

error check.

1 files changed, 15 insertions, 15 deletions

diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc
index 422774b1f..b33966064 100644
--- a/winsup/cygwin/spawn.cc
+++ b/winsup/cygwin/spawn.cc
@@ -709,21 +709,6 @@ spawn_guts (const char * prog_arg, const char *const *argv,
 		       &pi);
     }
 
-  /* FIXME: There is a small race here */
-
-  DWORD res;
-  pthread_cleanup cleanup;
-  pthread_cleanup_push (do_cleanup, (void *) &cleanup);
-  if (mode == _P_SYSTEM)
-    {
-      sigset_t child_block;
-      cleanup.oldint = signal (SIGINT, SIG_IGN);
-      cleanup.oldquit = signal (SIGQUIT, SIG_IGN);
-      sigemptyset (&child_block);
-      sigaddset (&child_block, SIGCHLD);
-      (void) sigprocmask (SIG_BLOCK, &child_block, &cleanup.oldmask);
-    }
-
   /* Restore impersonation. In case of _P_OVERLAY this isn't
      allowed since it would overwrite child data. */
   if (mode != _P_OVERLAY)
@@ -747,6 +732,21 @@ spawn_guts (const char * prog_arg, const char *const *argv,
       return -1;
     }
 
+  /* FIXME: There is a small race here */
+
+  DWORD res;
+  pthread_cleanup cleanup;
+  pthread_cleanup_push (do_cleanup, (void *) &cleanup);
+  if (mode == _P_SYSTEM)
+    {
+      sigset_t child_block;
+      cleanup.oldint = signal (SIGINT, SIG_IGN);
+      cleanup.oldquit = signal (SIGQUIT, SIG_IGN);
+      sigemptyset (&child_block);
+      sigaddset (&child_block, SIGCHLD);
+      (void) sigprocmask (SIG_BLOCK, &child_block, &cleanup.oldmask);
+    }
+
   /* Fixup the parent datastructure if needed and resume the child's
      main thread. */
   if (!cygheap->fdtab.need_fixup_before ())