diff options
author | Christopher Faylor <me@cgf.cx> | 2005-07-03 06:40:30 +0400 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2005-07-03 06:40:30 +0400 |
commit | 893ac8e03c21d246bbfc8d575a227d8c65cfae76 (patch) | |
tree | 4cee09d3d2a99f1eba1deeecb2c4e1b5710d1efc /winsup/cygwin/select.cc | |
parent | 766bda71333f106a6ec5279477cd5bdf25672e14 (diff) |
Replace valid memory checks with new myfault class "exception handling", almost
everywhere. Leave some thread.cc stuff alone for now.
* cygtls.h: Kludge some definitions to avoid including a problematic windows
header.
(_cygtls::_myfault): New entry.
(_cygtls::_myfault_errno): Ditto.
(_cygtls::fault_guarded): New function.
(_cygtls::setup_fault): Ditto.
(_cygtls::return_from_fault): Ditto.
(_cygtls::clear_fault): Ditto.
(myfault): New class.
* exceptions.cc (handle_exceptions): Handle case of guarded fault in system
routine.
* gendef: Add another entry point for setjmp that the compiler doesn't know
about and won't complain about.
* gentls_offsets: Just include windows.h rather than kludging a HANDLE def.
* miscfuncs.cc (check_null_str): Delete.
(check_null_empty_str): Ditto.
(check_null_empty_str_errno): Ditto.
(check_null_str_errno): Ditto.
(__check_null_invalid_struct): Ditto.
(__check_null_invalid_struct_errno): Ditto.
(__check_invalid_read_ptr): Ditto.
(__check_invalid_read_ptr_errno): Ditto.
(dummytest): New function.
(check_iovec_for_read): Delete.
(chec_iovec): Rename from check_iovec_for_write. Take a read/write parameter.
* tlsoffsets.h: Regenerate.
* winsup.h: Remove check_* declarations.
(check_iovec_for_read): Delete declaration. Turn into a define instead.
(check_iovec_for_write): Ditto.
(check_iovec): New declaration.
* thread.h: Use ifdef guard name consistent with other header files.
Diffstat (limited to 'winsup/cygwin/select.cc')
-rw-r--r-- | winsup/cygwin/select.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/winsup/cygwin/select.cc b/winsup/cygwin/select.cc index 1acf80eb2..13913c95f 100644 --- a/winsup/cygwin/select.cc +++ b/winsup/cygwin/select.cc @@ -166,19 +166,16 @@ pselect(int maxfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval tv; sigset_t oldset = myself->getsigmask (); + myfault efault; + if (efault.faulted (EFAULT)) + return -1; if (ts) { - if (check_invalid_read_struct_errno (ts)) - return -1; tv.tv_sec = ts->tv_sec; tv.tv_usec = ts->tv_nsec / 1000; } if (set) - { - if (check_invalid_read_struct_errno (set)) - return -1; - set_signal_mask (*set); - } + set_signal_mask (*set); int ret = cygwin_select (maxfds, readfds, writefds, exceptfds, ts ? &tv : NULL); if (set) |