fix spurious failures by fgetws when buffer ends with partial character

[musl] / src / time / localtime_r.c

diff --git a/src/time/localtime_r.c b/src/time/localtime_r.c
index c52678f..1a15b31 100644 (file)
--- a/src/time/localtime_r.c
+++ b/src/time/localtime_r.c
@@ -1,11 +1,17 @@
 #include "time_impl.h"
 #include <errno.h>
-#include "libc.h"
+#include <limits.h>
 
 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) {
+       if (__secs_to_tm((long long)*t + tm->__tm_gmtoff, tm) < 0) {
                errno = EOVERFLOW;
                return 0;
        }