diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2018-03-27 13:30:50 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2018-03-27 13:31:23 -0700 |
| commit | 72fad885b68617db85901a8e810211b557a31f99 (patch) | |
| tree | 4208da543025daeeec2ddaab26bf6bce81cf1ebf /lib/time_rz.c | |
| parent | 7bc31c1cd4b6a6eac0d29e31dbe3d208e2258ccf (diff) | |
| download | emacs-72fad885b68617db85901a8e810211b557a31f99.tar.gz emacs-72fad885b68617db85901a8e810211b557a31f99.tar.bz2 emacs-72fad885b68617db85901a8e810211b557a31f99.zip | |
Update from Gnulib
This incorporates:
2018-03-26 time_rz: work around Mac OS X 10.6 infloop
2018-03-20 euidaccess: Port to native Windows.
* lib/euidaccess.c, lib/time_rz.c, m4/time_rz.m4: Copy from Gnulib.
Diffstat (limited to 'lib/time_rz.c')
| -rw-r--r-- | lib/time_rz.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/lib/time_rz.c b/lib/time_rz.c index c1eca888f2c..5293c7cf8dc 100644 --- a/lib/time_rz.c +++ b/lib/time_rz.c @@ -286,6 +286,21 @@ revert_tz (timezone_t tz) struct tm * localtime_rz (timezone_t tz, time_t const *t, struct tm *tm) { +#ifdef HAVE_LOCALTIME_INFLOOP_BUG + /* The -67768038400665599 comes from: + https://lists.gnu.org/r/bug-gnulib/2017-07/msg00142.html + On affected platforms the greatest POSIX-compatible time_t value + that could return nonnull is 67768036191766798 (when + TZ="XXX24:59:59" it resolves to the year 2**31 - 1 + 1900, on + 12-31 at 23:59:59), so test for that too while we're in the + neighborhood. */ + if (! (-67768038400665599 <= *t && *t <= 67768036191766798)) + { + errno = EOVERFLOW; + return NULL; + } +#endif + if (!tz) return gmtime_r (t, tm); else |