diff options
| author | Rich Felker <dalias@aerifal.cx> | 2013-12-19 05:05:13 -0500 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2013-12-19 05:05:13 -0500 |
| commit | f89e29829029c5003450f7b58bd00fe5d1049d09 (patch) | |
| tree | 5fa7b2090d5a0c9a8beb0681f76c08c278f7fd21 /src/time | |
| parent | 0311d1dd17ca88da6edd61b6535ec8637642dfe4 (diff) | |
| download | musl-f89e29829029c5003450f7b58bd00fe5d1049d09.tar.gz musl-f89e29829029c5003450f7b58bd00fe5d1049d09.tar.bz2 musl-f89e29829029c5003450f7b58bd00fe5d1049d09.tar.xz musl-f89e29829029c5003450f7b58bd00fe5d1049d09.zip | |
fix hangs in localtime for near-overflowing time_t values on 64-bit archs
Diffstat (limited to 'src/time')
| -rw-r--r-- | src/time/localtime_r.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/time/localtime_r.c b/src/time/localtime_r.c index c52678fd..1d43d9f4 100644 --- a/src/time/localtime_r.c +++ b/src/time/localtime_r.c @@ -4,6 +4,12 @@ struct tm *__localtime_r(const time_t *restrict t, struct tm *restrict tm) { + /* Reject time_t values whose year would overflow int because + * __secs_to_zone cannot safely handle them. */ + if (*t < INT_MIN * 31622400LL || *t > INT_MAX * 31622400LL) { + errno = EOVERFLOW; + return 0; + } __secs_to_zone(*t, 0, &tm->tm_isdst, &tm->__tm_gmtoff, 0, &tm->__tm_zone); if (__secs_to_tm((long long)*t - tm->__tm_gmtoff, tm) < 0) { errno = EOVERFLOW; |