>From 96e52c5786964954e41e3242b5342a9462f6fa78 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 2 Nov 2018 18:48:57 -0700 Subject: [PATCH] mktime: fix EOVERFLOW bug This fixes a glibc bug I reported here: https://sourceware.org/bugzilla/show_bug.cgi?id=23789 * lib/mktime.c: Sync from glibc, incorporating the following: [!_LIBC && !DEBUG_MKTIME]: Include libc-config.h, not config.h, for __set_errno. (guess_time_tm, __mktime_internal): Set errno to EOVERFLOW on overflow. * m4/mktime.m4 (gl_FUNC_MKTIME_WORKS): Check for EOVERFLOW bug in glibc 2.28 and earlier. * modules/mktime (Depends-on): Add libc-config. --- ChangeLog | 11 +++++++++++ lib/mktime.c | 21 +++++++++++++++------ m4/mktime.m4 | 5 ++++- modules/mktime | 1 + 4 files changed, 31 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index bbf379b8c..2ce3520fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,16 @@ 2018-11-02 Paul Eggert + mktime: fix EOVERFLOW bug + This fixes a glibc bug I reported here: + https://sourceware.org/bugzilla/show_bug.cgi?id=23789 + * lib/mktime.c: Sync from glibc, incorporating the following: + [!_LIBC && !DEBUG_MKTIME]: + Include libc-config.h, not config.h, for __set_errno. + (guess_time_tm, __mktime_internal): Set errno to EOVERFLOW on overflow. + * m4/mktime.m4 (gl_FUNC_MKTIME_WORKS): + Check for EOVERFLOW bug in glibc 2.28 and earlier. + * modules/mktime (Depends-on): Add libc-config. + gnulib-common.m4: port _Noreturn to C++ Problem reported by Akim Demaille in: https://lists.gnu.org/r/bug-bison/2018-10/msg00067.html diff --git a/lib/mktime.c b/lib/mktime.c index 00f0dec6b..26f7a2751 100644 --- a/lib/mktime.c +++ b/lib/mktime.c @@ -39,7 +39,7 @@ */ #if !defined _LIBC && !DEBUG_MKTIME -# include +# include #endif /* Assume that leap seconds are possible, unless told otherwise. @@ -51,6 +51,7 @@ #include +#include #include #include #include @@ -255,8 +256,9 @@ long_int_avg (long_int a, long_int b) If TP is null, return a value not equal to T; this avoids false matches. YEAR and YDAY must not be so large that multiplying them by three times the number of seconds in a year (or day, respectively) would overflow long_int. - If the returned value would be out of range, yield the minimal or - maximal in-range value, except do not yield a value equal to T. */ + If TP is non-null and the returned value would be out of range, set + errno to EOVERFLOW and yield a minimal or maximal in-range value + that is not equal to T. */ static long_int guess_time_tm (long_int year, long_int yday, int hour, int min, int sec, long_int t, const struct tm *tp) @@ -269,9 +271,10 @@ guess_time_tm (long_int year, long_int yday, int hour, int min, int sec, tp->tm_hour, tp->tm_min, tp->tm_sec); if (! INT_ADD_WRAPV (t, d, &result)) return result; + __set_errno (EOVERFLOW); } - /* Overflow occurred one way or another. Return the nearest result + /* An error occurred, probably overflow. Return the nearest result that is actually in range, except don't report a zero difference if the actual difference is nonzero, as that would cause a false match; and don't oscillate between two values, as that would @@ -344,6 +347,8 @@ ranged_convert (struct tm *(*convert) (const time_t *, struct tm *), Use *OFFSET to keep track of a guess at the offset of the result, compared to what the result would be for UTC without leap seconds. If *OFFSET's guess is correct, only one CONVERT call is needed. + If successful, set *TP to the canonicalized struct tm; + otherwise leave *TP alone, return ((time_t) -1) and set errno. This function is external because it is used also by timegm.c. */ time_t __mktime_internal (struct tm *tp, @@ -505,8 +510,12 @@ __mktime_internal (struct tm *tp, sec_adjustment -= sec; sec_adjustment += sec_requested; if (INT_ADD_WRAPV (t, sec_adjustment, &t) - || ! (mktime_min <= t && t <= mktime_max) - || ! convert_time (convert, t, &tm)) + || ! (mktime_min <= t && t <= mktime_max)) + { + __set_errno (EOVERFLOW); + return -1; + } + if (! convert_time (convert, t, &tm)) return -1; } diff --git a/m4/mktime.m4 b/m4/mktime.m4 index 4b3e399be..88f5dc92f 100644 --- a/m4/mktime.m4 +++ b/m4/mktime.m4 @@ -1,4 +1,4 @@ -# serial 30 +# serial 31 dnl Copyright (C) 2002-2003, 2005-2007, 2009-2018 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation @@ -43,6 +43,7 @@ AC_DEFUN([gl_FUNC_MKTIME_WORKS], [AC_RUN_IFELSE( [AC_LANG_SOURCE( [[/* Test program from Paul Eggert and Tony Leneis. */ +#include #include #include #include @@ -150,6 +151,8 @@ bigtime_test (int j) == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst)))) return 0; } + else if (errno != EOVERFLOW) + return 0; return 1; } diff --git a/modules/mktime b/modules/mktime index f08c5b14c..17ed3cd78 100644 --- a/modules/mktime +++ b/modules/mktime @@ -10,6 +10,7 @@ Depends-on: time multiarch intprops [test $REPLACE_MKTIME = 1] +libc-config [test $REPLACE_MKTIME = 1] stdbool [test $REPLACE_MKTIME = 1] time_r [test $REPLACE_MKTIME = 1] verify [test $REPLACE_MKTIME = 1] -- 2.19.1