summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/cygwin/ChangeLog5
-rw-r--r--winsup/cygwin/timer.cc7
2 files changed, 7 insertions, 5 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 6015c4251..631e6d322 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,10 @@
2005-03-28 Christopher Faylor <cgf@timesys.com>
+ * timer.cc (getitimer): Check that ovalue is a valid pointer, not just
+ NULL.
+
+2005-03-28 Christopher Faylor <cgf@timesys.com>
+
* timer.cc (timer_tracker::settime): Set times to zero when just
cancelling a timer.
diff --git a/winsup/cygwin/timer.cc b/winsup/cygwin/timer.cc
index 746362779..8815cdc63 100644
--- a/winsup/cygwin/timer.cc
+++ b/winsup/cygwin/timer.cc
@@ -386,11 +386,8 @@ getitimer (int which, struct itimerval *ovalue)
set_errno (EINVAL);
return -1;
}
- if (ovalue == NULL)
- {
- set_errno (EFAULT);
- return -1;
- }
+ if (check_null_invalid_struct_errno (ovalue))
+ return -1;
struct itimerspec spec_ovalue;
int ret = timer_gettime ((timer_t) &ttstart, &spec_ovalue);
if (!ret)