>From ab45ee41d8165913c805cdd7c7de2e6060db24ec Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 31 Aug 2018 16:17:06 -0700 Subject: [PATCH 2/3] Fix mktime localtime offset confusion * include/time.h (__mktime_internal): The localtime offset is now of type long int instead of time_t. This is the longstanding type in glibc, and it is more than enough to represent difference between localtime and gmtime even if it is 32 bits and time_t is 64. Changing it now will let us avoid an unnecessary change when time_t is widened to 64 bits on 32-bit platforms. * time/mktime.c, time/timegm.c (mktime_offset_t) [_LIBC]: Now long int. --- ChangeLog | 9 +++++++++ include/time.h | 4 ++-- time/mktime.c | 2 +- time/timegm.c | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index d1ab1b0718..9f31582e19 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2018-08-31 Paul Eggert + Fix mktime localtime offset confusion + * include/time.h (__mktime_internal): The localtime offset is now + of type long int instead of time_t. This is the longstanding type + in glibc, and it is more than enough to represent difference + between localtime and gmtime even if it is 32 bits and time_t is + 64. Changing it now will let us avoid an unnecessary change when + time_t is widened to 64 bits on 32-bit platforms. + * time/mktime.c, time/timegm.c (mktime_offset_t) [_LIBC]: Now long int. + Merge mktime, timegm from upstream Gnulib This fixes some obscure problems with integer overflow. Although it looks scary, it is a byte-for-byte copy from Gnulib, diff --git a/include/time.h b/include/time.h index f562f681c3..114d0f7da6 100644 --- a/include/time.h +++ b/include/time.h @@ -52,11 +52,11 @@ extern void __tz_compute (__time64_t timer, struct tm *tm, int use_localtime) /* Subroutine of `mktime'. Return the `time_t' representation of TP and normalize TP, given that a `struct tm *' maps to a `time_t' as performed - by FUNC. Keep track of next guess for time_t offset in *OFFSET. */ + by FUNC. Record next guess for localtime-gmtime offset in *OFFSET. */ extern time_t __mktime_internal (struct tm *__tp, struct tm *(*__func) (const time_t *, struct tm *), - time_t *__offset) attribute_hidden; + long int *__offset) attribute_hidden; /* nis/nis_print.c needs ctime, so even if ctime is not declared here, we define __ctime64 as ctime so that nis/nis_print.c can get linked diff --git a/time/mktime.c b/time/mktime.c index 2858764792..a307671feb 100644 --- a/time/mktime.c +++ b/time/mktime.c @@ -77,7 +77,7 @@ #endif #ifdef _LIBC -typedef time_t mktime_offset_t; +typedef long int mktime_offset_t; #else # include "mktime-internal.h" #endif diff --git a/time/timegm.c b/time/timegm.c index 275a7a2eca..71276bbe0b 100644 --- a/time/timegm.c +++ b/time/timegm.c @@ -24,7 +24,7 @@ #include #ifdef _LIBC -typedef time_t mktime_offset_t; +typedef long int mktime_offset_t; #else # include "mktime-internal.h" #endif -- 2.17.1