Merge branch 'master' into v2.1

1 files changed, 1 insertions, 1 deletions

diff --git a/src/lib_os.c b/src/lib_os.c
index bf1749151..d91cb976e 100644
--- a/src/lib_os.c
+++ b/src/lib_os.c
@@ -230,6 +230,7 @@ LJLIB_CF(os_date)
 LJLIB_CF(os_time)
 {
   time_t t;
+  errno = 0;
   if (lua_isnoneornil(L, 1)) {  /* called without args? */
     t = time(NULL);  /* get current time */
   } else {
@@ -243,7 +244,6 @@ LJLIB_CF(os_time)
     ts.tm_mon = (int)((unsigned int)getfield(L, "month", -1) - 1u);
     ts.tm_year = (int)((unsigned int)getfield(L, "year", -1) - 1900u);
     ts.tm_isdst = getboolfield(L, "isdst");
-    errno = 0;
     t = mktime(&ts);
   }
   if (t == (time_t)(-1) && errno != 0)