diff options
author | Christopher Faylor <me@cgf.cx> | 2011-11-24 01:58:43 +0400 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2011-11-24 01:58:43 +0400 |
commit | 5f38ec468115a6ddf2c458f2b8f9c4abfd8b0359 (patch) | |
tree | 02842aecf3c981e701c99190a13b333f73c2f8b7 /winsup/cygwin/child_info.h | |
parent | 9f65451e3e9b5a3a5c7c35343daee24a09d1d3a2 (diff) |
* pipe.cc (fhandler_pipe::create): Avoid derefencing a NULL pointer.
* child_info.h (child_info): Reorganize some elements so that the ones which
are initialized in a constructor are all together.
* sigproc.cc (child_info::child_info): Initialize values via the constructor
rather than as C statements and make sure that flags is set to zero initially.
* spawn.cc (child_info_spawn::worker): Use iscygwin() test for determining when
to send strace info since it is more foolproof than checking the suspend state.
Diffstat (limited to 'winsup/cygwin/child_info.h')
-rw-r--r-- | winsup/cygwin/child_info.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/winsup/cygwin/child_info.h b/winsup/cygwin/child_info.h index d69d44166..91cf3c58c 100644 --- a/winsup/cygwin/child_info.h +++ b/winsup/cygwin/child_info.h @@ -57,15 +57,15 @@ public: DWORD intro; // improbable string unsigned long magic; // magic number unique to child_info unsigned short type; // type of record, exec, spawn, fork + init_cygheap *cygheap; + void *cygheap_max; + unsigned char flag; + int retry; // number of times we've tried to start child process HANDLE subproc_ready; // used for synchronization with parent HANDLE user_h; HANDLE parent; - init_cygheap *cygheap; - void *cygheap_max; DWORD cygheap_reserve_sz; - unsigned char flag; unsigned fhandler_union_cb; - int retry; // number of times we've tried to start child process DWORD exit_code; // process exit code static int retry_count;// retry count; child_info (unsigned, child_info_types, bool); |