From 8d13061740b01afa777b856e7fe5121ef58c05d3 Mon Sep 17 00:00:00 2001 From: cgf Date: Wed, 15 Nov 2000 06:46:19 +0000 Subject: [PATCH] * fork.cc (slow_pid_reuse): Off-by-one. --- winsup/cygwin/ChangeLog | 4 ++++ winsup/cygwin/fork.cc | 10 ++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 1b183758b5..aa8ab92957 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,7 @@ +Wed Nov 15 01:44:37 2000 Christopher Faylor + + * fork.cc (slow_pid_reuse): Off-by-one. + Wed Nov 15 01:20:24 2000 Christopher Faylor Throughout use myself->ppid_handle rather than parent_alive. diff --git a/winsup/cygwin/fork.cc b/winsup/cygwin/fork.cc index e3ac404750..71da9f5443 100644 --- a/winsup/cygwin/fork.cc +++ b/winsup/cygwin/fork.cc @@ -314,19 +314,21 @@ fork_child (HANDLE& hParent, dll *&first_dll, bool& load_dlls) static void slow_pid_reuse (HANDLE h) { - static NO_COPY HANDLE last_fork_procs[64]; + static NO_COPY HANDLE last_fork_procs[64] = {0}; static NO_COPY unsigned nfork_procs = 0; - if (nfork_procs > (sizeof (last_fork_procs) / sizeof (last_fork_procs [0]))) + if (nfork_procs >= (sizeof (last_fork_procs) / sizeof (last_fork_procs [0]))) nfork_procs = 0; /* Keep a list of handles to forked processes sitting around to prevent Windows from reusing the same pid n times in a row. Having the same pids close in succesion confuses bash. Keeping a handle open will stop windows from reusing the same pid. */ if (last_fork_procs[nfork_procs]) - CloseHandle (last_fork_procs[nfork_procs]); - if (!DuplicateHandle (hMainProc, h, hMainProc, &last_fork_procs[nfork_procs], + ForceCloseHandle1 (last_fork_procs[nfork_procs], fork_stupidity); + if (DuplicateHandle (hMainProc, h, hMainProc, &last_fork_procs[nfork_procs], 0, FALSE, DUPLICATE_SAME_ACCESS)) + ProtectHandle1 (last_fork_procs[nfork_procs], fork_stupidity); + else { last_fork_procs[nfork_procs] = NULL; system_printf ("couldn't create last_fork_proc, %E"); -- 2.11.0