diff options
| author | brooks <brooks@FreeBSD.org> | 2014-05-08 16:12:38 +0000 |
|---|---|---|
| committer | brooks <brooks@FreeBSD.org> | 2014-05-08 16:12:38 +0000 |
| commit | 5b893a150d624da11aa08d7d39cfbe6b752df956 (patch) | |
| tree | 1f7a9893a3b6f906de4112d59d6b7f6e7bcdbe5b | |
| parent | 1cf59d11f48577bcd6fc3157bb8eb1d8a40e01d7 (diff) | |
| download | FreeBSD-src-5b893a150d624da11aa08d7d39cfbe6b752df956.zip FreeBSD-src-5b893a150d624da11aa08d7d39cfbe6b752df956.tar.gz | |
MFC r265201
Fix a 2038 bug.
If time_t is 64-bit (i.e. isn't 32-bit) allow any value of year, not
just years less than 2038.
Don't bother fixing the underflow in the case of years before 1903.
MFC after: 1 week
Sponsored by: DARPA, AFRL
| -rw-r--r-- | sys/kern/subr_clock.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/kern/subr_clock.c b/sys/kern/subr_clock.c index dbd74f7..f30f529 100644 --- a/sys/kern/subr_clock.c +++ b/sys/kern/subr_clock.c @@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$"); #include <sys/kernel.h> #include <sys/bus.h> #include <sys/clock.h> +#include <sys/limits.h> #include <sys/sysctl.h> #include <sys/timetc.h> @@ -147,7 +148,7 @@ clock_ct_to_ts(struct clocktime *ct, struct timespec *ts) if (ct->mon < 1 || ct->mon > 12 || ct->day < 1 || ct->day > days_in_month(year, ct->mon) || ct->hour > 23 || ct->min > 59 || ct->sec > 59 || - ct->year > 2037) { /* time_t overflow */ + (sizeof(time_t) == 4 && year > 2037)) { /* time_t overflow */ if (ct_debug) printf(" = EINVAL\n"); return (EINVAL); |
