diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | time/mktime.c | 4 |
2 files changed, 10 insertions, 1 deletions
@@ -1,5 +1,12 @@ 2018-11-15 Paul Eggert <eggert@cs.ucla.edu> + mktime: fix bug with Y2038 DST transition + [BZ#23789] + * time/mktime.c (ranged_convert): On 32-bit platforms, don’t + mishandle a DST transition that jumps over the Y2038 boundary. + No such DST transitions are known so this is only a theoretical + bug, but we might as well do things right. + mktime: make more room for overflow [BZ#23789] * time/mktime.c (long_int): Now 4⨯ int, not just 3⨯. diff --git a/time/mktime.c b/time/mktime.c index ffbb5ea..6d5b8cf 100644 --- a/time/mktime.c +++ b/time/mktime.c @@ -323,7 +323,7 @@ ranged_convert (struct tm *(*convert) (const time_t *, struct tm *), while (true) { long_int mid = long_int_avg (ok, bad); - if (mid != ok && mid != bad) + if (mid == ok || mid == bad) break; r = convert_time (convert, mid, tp); if (r) @@ -332,6 +332,8 @@ ranged_convert (struct tm *(*convert) (const time_t *, struct tm *), bad = mid; } + *t = ok; + if (!r && ok) { /* The last conversion attempt failed; |