getservbyport_r: fix wrong result if getnameinfo fails with EAI_OVERFLOW

[musl] / src / time / mktime.c

diff --git a/src/time/mktime.c b/src/time/mktime.c
index ef1fb42..bad3f07 100644 (file)
--- a/src/time/mktime.c
+++ b/src/time/mktime.c
@@ -1,7 +1,5 @@
 #include "time_impl.h"
 #include <errno.h>
-#include <stdlib.h>
-#include <string.h>
 
 time_t mktime(struct tm *tm)
 {
@@ -12,14 +10,14 @@ time_t mktime(struct tm *tm)
        __secs_to_zone(t, 1, &new.tm_isdst, &new.__tm_gmtoff, &opp, &new.__tm_zone);
 
        if (tm->tm_isdst>=0 && new.tm_isdst!=tm->tm_isdst)
-               t += opp - new.__tm_gmtoff;
+               t -= opp - new.__tm_gmtoff;
 
-       t += new.__tm_gmtoff;
+       t -= new.__tm_gmtoff;
        if ((time_t)t != t) goto error;
 
        __secs_to_zone(t, 0, &new.tm_isdst, &new.__tm_gmtoff, &opp, &new.__tm_zone);
 
-       if (__secs_to_tm(t - new.__tm_gmtoff, &new) < 0) goto error;
+       if (__secs_to_tm(t + new.__tm_gmtoff, &new) < 0) goto error;
 
        *tm = new;
        return t;