diff options
author | Corinna Vinschen <corinna@vinschen.de> | 2016-04-05 11:26:06 +0300 |
---|---|---|
committer | Corinna Vinschen <corinna@vinschen.de> | 2016-04-05 11:30:28 +0300 |
commit | 41abcc5825d33d78bd370997ba664e3c64eb6683 (patch) | |
tree | 5d69acdb43f4b1a415e2d870a18ff18675f0c9df /winsup/cygwin/sigproc.cc | |
parent | 722e363c4de410e67f24d0da3129c446074716bc (diff) |
Revert "Refactor to avoid nonnull checks on "this" pointer."
This reverts commit 0008bdea02b690ab19ffe997499cb9a96ee5a66d.
This patch introduced a regression. Calling FOO=$(...) in zsh hangs
indefinitely and has to be killed forcefully.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diffstat (limited to 'winsup/cygwin/sigproc.cc')
-rw-r--r-- | winsup/cygwin/sigproc.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/winsup/cygwin/sigproc.cc b/winsup/cygwin/sigproc.cc index 32beb3430..981004540 100644 --- a/winsup/cygwin/sigproc.cc +++ b/winsup/cygwin/sigproc.cc @@ -155,8 +155,7 @@ proc_can_be_signalled (_pinfo *p) bool __reg1 pid_exists (pid_t pid) { - pinfo p(pid); - return p && p->exists (); + return pinfo (pid)->exists (); } /* Return true if this is one of our children, false otherwise. */ @@ -1144,7 +1143,7 @@ remove_proc (int ci) if (_my_tls._ctinfo != procs[ci].wait_thread) procs[ci].wait_thread->terminate_thread (); } - else if (procs[ci] && procs[ci]->exists ()) + else if (procs[ci]->exists ()) return true; sigproc_printf ("removing procs[%d], pid %d, nprocs %d", ci, procs[ci]->pid, |