[newlib-cygwin] Cygwin: fork: terminate child process unconditionally in error case
Corinna Vinschen
corinna@sourceware.org
Tue Feb 5 11:55:00 GMT 2019
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=7225a82c1a4e90bcea2a17da12a427d1e783de30
commit 7225a82c1a4e90bcea2a17da12a427d1e783de30
Author: Corinna Vinschen <corinna@vinschen.de>
Date: Tue Feb 5 12:52:13 2019 +0100
Cygwin: fork: terminate child process unconditionally in error case
Move TerminateProcess call into cleanup code to make sure child
doesn't linger in some border cases.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diff:
---
winsup/cygwin/fork.cc | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/winsup/cygwin/fork.cc b/winsup/cygwin/fork.cc
index 6f00364..5f77524 100644
--- a/winsup/cygwin/fork.cc
+++ b/winsup/cygwin/fork.cc
@@ -400,7 +400,6 @@ frok::parent (volatile char * volatile stack_here)
we can't actually record the pid in the internal table. */
if (!child.remember (false))
{
- TerminateProcess (hchild, 1);
this_errno = EAGAIN;
#ifdef DEBUGGING0
error ("child remember failed");
@@ -508,8 +507,12 @@ cleanup:
__malloc_unlock ();
/* Remember to de-allocate the fd table. */
- if (hchild && !child.hProcess) /* no child.procinfo */
- ForceCloseHandle1 (hchild, childhProc);
+ if (hchild)
+ {
+ TerminateProcess (hchild, 1);
+ if (!child.hProcess) /* no child.procinfo */
+ ForceCloseHandle1 (hchild, childhProc);
+ }
if (forker_finished)
ForceCloseHandle (forker_finished);
debug_printf ("returning -1");
More information about the Cygwin-cvs
mailing list