diff options
author | Christopher Faylor <me@cgf.cx> | 2005-07-03 02:40:30 +0000 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2005-07-03 02:40:30 +0000 |
commit | 893ac8e03c21d246bbfc8d575a227d8c65cfae76 (patch) | |
tree | 4cee09d3d2a99f1eba1deeecb2c4e1b5710d1efc /winsup/cygwin/thread.cc | |
parent | 766bda71333f106a6ec5279477cd5bdf25672e14 (diff) | |
download | cygnal-893ac8e03c21d246bbfc8d575a227d8c65cfae76.tar.gz cygnal-893ac8e03c21d246bbfc8d575a227d8c65cfae76.tar.bz2 cygnal-893ac8e03c21d246bbfc8d575a227d8c65cfae76.zip |
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/thread.cc')
-rw-r--r-- | winsup/cygwin/thread.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/winsup/cygwin/thread.cc b/winsup/cygwin/thread.cc index c0a55dc31..2d5d273df 100644 --- a/winsup/cygwin/thread.cc +++ b/winsup/cygwin/thread.cc @@ -1771,7 +1771,8 @@ semaphore::_timedwait (const struct timespec *abstime) struct timeval tv; long waitlength; - if (__check_invalid_read_ptr (abstime, sizeof *abstime)) + myfault efault; + if (efault.faulted ()) { /* According to SUSv3, abstime need not be checked for validity, if the semaphore can be locked immediately. */ @@ -3233,9 +3234,8 @@ semaphore::post (sem_t *sem) int semaphore::getvalue (sem_t *sem, int *sval) { - - if (!is_good_object (sem) - || __check_null_invalid_struct (sval, sizeof (int))) + myfault efault; + if (efault.faulted () || !is_good_object (sem)) { set_errno (EINVAL); return -1; |