From 893ac8e03c21d246bbfc8d575a227d8c65cfae76 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Sun, 3 Jul 2005 02:40:30 +0000
Subject: 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.

---
 winsup/cygwin/timer.cc | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

(limited to 'winsup/cygwin/timer.cc')

diff --git a/winsup/cygwin/timer.cc b/winsup/cygwin/timer.cc
index 0714eb160..b6f1b4cdd 100644
--- a/winsup/cygwin/timer.cc
+++ b/winsup/cygwin/timer.cc
@@ -216,10 +216,10 @@ timer_tracker::settime (int in_flags, const itimerspec *value, itimerspec *ovalu
       return -1;
     }
 
-  if (__check_invalid_read_ptr_errno (value, sizeof (*value))
+  myfault efault;
+  if (efault.faulted (EFAULT)
       || it_bad (value->it_value)
-      || it_bad (value->it_interval)
-      || (ovalue && check_null_invalid_struct_errno (ovalue)))
+      || it_bad (value->it_interval))
     return -1;
 
   long long now = in_flags & TIMER_ABSTIME ? 0 : gtod.usecs (false);
@@ -271,11 +271,12 @@ timer_tracker::gettime (itimerspec *ovalue)
 extern "C" int
 timer_gettime (timer_t timerid, struct itimerspec *ovalue)
 {
-  if (check_null_invalid_struct_errno (ovalue))
+  myfault efault;
+  if (efault.faulted (EFAULT))
     return -1;
 
   timer_tracker *tt = (timer_tracker *) timerid;
-  if (check_null_invalid_struct (tt) || tt->magic != TT_MAGIC)
+  if (tt->magic != TT_MAGIC)
     {
       set_errno (EINVAL);
       return -1;
@@ -288,8 +289,8 @@ timer_gettime (timer_t timerid, struct itimerspec *ovalue)
 extern "C" int
 timer_create (clockid_t clock_id, struct sigevent *evp, timer_t *timerid)
 {
-  if (evp && check_null_invalid_struct_errno (evp)
-      || check_null_invalid_struct_errno (timerid))
+  myfault efault;
+  if (efault.faulted (EFAULT))
     return -1;
   if (clock_id != CLOCK_REALTIME)
     {
@@ -306,7 +307,10 @@ timer_settime (timer_t timerid, int flags, const struct itimerspec *value,
 	       struct itimerspec *ovalue)
 {
   timer_tracker *tt = (timer_tracker *) timerid;
-  if (check_null_invalid_struct (tt) || tt->magic != TT_MAGIC)
+  myfault efault;
+  if (efault.faulted (EFAULT))
+    return -1;
+  if (tt->magic != TT_MAGIC)
     {
       set_errno (EINVAL);
       return -1;
@@ -319,7 +323,10 @@ extern "C" int
 timer_delete (timer_t timerid)
 {
   timer_tracker *in_tt = (timer_tracker *) timerid;
-  if (check_null_invalid_struct (in_tt) || in_tt->magic != TT_MAGIC)
+  myfault efault;
+  if (efault.faulted (EFAULT))
+    return -1;
+  if (in_tt->magic != TT_MAGIC)
     {
       set_errno (EINVAL);
       return -1;
@@ -386,7 +393,8 @@ getitimer (int which, struct itimerval *ovalue)
       set_errno (EINVAL);
       return -1;
     }
-  if (check_null_invalid_struct_errno (ovalue))
+  myfault efault;
+  if (efault.faulted (EFAULT))
     return -1;
   struct itimerspec spec_ovalue;
   int ret = timer_gettime ((timer_t) &ttstart, &spec_ovalue);
-- 
cgit v1.2.3