diff options
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/fork.cc | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 00ee93c78..64c15988e 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,10 @@ 2007-03-01 Christopher Faylor <me@cgf.cx> + * fork.cc (fork): Reset child to true after fork since it may have been + reset by fork memory copies. + +2007-03-01 Christopher Faylor <me@cgf.cx> + * Makefile (DLL_OFILES): Remove ntea.o * environ.cc (set_ntea): Delete. (parse_thing): Delete "ntea" setting. diff --git a/winsup/cygwin/fork.cc b/winsup/cygwin/fork.cc index dc59e4f70..e1b546d97 100644 --- a/winsup/cygwin/fork.cc +++ b/winsup/cygwin/fork.cc @@ -94,6 +94,7 @@ public: class hold_everything { +public: /* DELETEME*/ bool& ischild; /* Note the order of the locks below. It is important, to avoid races, that the lock order be preserved. @@ -620,11 +621,13 @@ fork () volatile char * volatile esp; __asm__ volatile ("movl %%esp,%0": "=r" (esp)); - if (!ischild) res = grouped.parent (esp); else - res = grouped.child (esp); + { + res = grouped.child (esp); + ischild = true; /* might have been reset by fork mem copy */ + } } MALLOC_CHECK; |