diff --git a/include/common/ttime.h b/include/common/ttime.h
index 4a7c47d1725dcc3dd1fde1e5c17a021e992156fb..f189959f22ca4bee4b07518aff00e7bbc527fb87 100644
--- a/include/common/ttime.h
+++ b/include/common/ttime.h
@@ -64,7 +64,7 @@ static FORCE_INLINE int64_t taosGetTimestampToday(int32_t precision) {
                                                                 : 1000000000;
   time_t    t = taosTime(NULL);
   struct tm tm;
-  taosLocalTime(&t, &tm);
+  taosLocalTime(&t, &tm, NULL);
   tm.tm_hour = 0;
   tm.tm_min = 0;
   tm.tm_sec = 0;
diff --git a/include/os/osTime.h b/include/os/osTime.h
index 0a0a54119b4a40b79e54b7183b0cdc57cac03ca7..51a285a1393171ea59940498a4c8134afa270366 100644
--- a/include/os/osTime.h
+++ b/include/os/osTime.h
@@ -91,7 +91,7 @@ static FORCE_INLINE int64_t taosGetMonoTimestampMs() {
 }
 
 char      *taosStrpTime(const char *buf, const char *fmt, struct tm *tm);
-struct tm *taosLocalTime(const time_t *timep, struct tm *result);
+struct tm *taosLocalTime(const time_t *timep, struct tm *result, char *buf);
 struct tm *taosLocalTimeNolock(struct tm *result, const time_t *timep, int dst);
 time_t     taosTime(time_t *t);
 time_t     taosMktime(struct tm *timep);
diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
index eeb2d4ff2eeb7a4cde9bc4c2197e909b606f346d..03102b11a3f000a98467f9dab06120dc243fc777 100644
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -1864,8 +1864,7 @@ static char* formatTimestamp(char* buf, int64_t val, int precision) {
     }
   }
   struct tm ptm = {0};
-  if (taosLocalTime(&tt, &ptm) == NULL) {
-    sprintf(buf, "NaN");
+  if (taosLocalTime(&tt, &ptm, buf) == NULL) {
     return buf;
   }
   size_t pos = strftime(buf, 35, "%Y-%m-%d %H:%M:%S", &ptm);
diff --git a/source/common/src/ttime.c b/source/common/src/ttime.c
index 2f39cdeaa0c15ebeb4afe8e5e2933d291ffef42f..dcd539bd91e11c570a9f779f9c1c9a3811765c41 100644
--- a/source/common/src/ttime.c
+++ b/source/common/src/ttime.c
@@ -727,7 +727,7 @@ int64_t taosTimeAdd(int64_t t, int64_t duration, char unit, int32_t precision) {
 
   struct tm tm;
   time_t    tt = (time_t)(t / TSDB_TICK_PER_SECOND(precision));
-  taosLocalTime(&tt, &tm);
+  taosLocalTime(&tt, &tm, NULL);
   int32_t mon = tm.tm_year * 12 + tm.tm_mon + (int32_t)numOfMonth;
   tm.tm_year = mon / 12;
   tm.tm_mon = mon % 12;
@@ -750,11 +750,11 @@ int32_t taosTimeCountInterval(int64_t skey, int64_t ekey, int64_t interval, char
 
   struct tm tm;
   time_t    t = (time_t)skey;
-  taosLocalTime(&t, &tm);
+  taosLocalTime(&t, &tm, NULL);
   int32_t smon = tm.tm_year * 12 + tm.tm_mon;
 
   t = (time_t)ekey;
-  taosLocalTime(&t, &tm);
+  taosLocalTime(&t, &tm, NULL);
   int32_t emon = tm.tm_year * 12 + tm.tm_mon;
 
   if (unit == 'y') {
@@ -774,7 +774,7 @@ int64_t taosTimeTruncate(int64_t t, const SInterval* pInterval, int32_t precisio
     start /= (int64_t)(TSDB_TICK_PER_SECOND(precision));
     struct tm tm;
     time_t    tt = (time_t)start;
-    taosLocalTime(&tt, &tm);
+    taosLocalTime(&tt, &tm, NULL);
     tm.tm_sec = 0;
     tm.tm_min = 0;
     tm.tm_hour = 0;
@@ -867,8 +867,7 @@ const char* fmtts(int64_t ts) {
 
   if (ts > -62135625943 && ts < 32503651200) {
     time_t t = (time_t)ts;
-    if (taosLocalTime(&t, &tm) == NULL) {
-      sprintf(buf, "NaN");
+    if (taosLocalTime(&t, &tm, buf) == NULL) {
       return buf;
     }
     pos += strftime(buf + pos, sizeof(buf), "s=%Y-%m-%d %H:%M:%S", &tm);
@@ -876,8 +875,7 @@ const char* fmtts(int64_t ts) {
 
   if (ts > -62135625943000 && ts < 32503651200000) {
     time_t t = (time_t)(ts / 1000);
-    if (taosLocalTime(&t, &tm) == NULL) {
-      sprintf(buf, "NaN");
+    if (taosLocalTime(&t, &tm, buf) == NULL) {
       return buf;
     }
     if (pos > 0) {
@@ -891,8 +889,7 @@ const char* fmtts(int64_t ts) {
 
   {
     time_t t = (time_t)(ts / 1000000);
-    if (taosLocalTime(&t, &tm) == NULL) {
-      sprintf(buf, "NaN");
+    if (taosLocalTime(&t, &tm, buf) == NULL) {
       return buf;
     }
     if (pos > 0) {
@@ -946,8 +943,7 @@ void taosFormatUtcTime(char* buf, int32_t bufLen, int64_t t, int32_t precision)
       ASSERT(false);
   }
 
-  if (taosLocalTime(&quot, &ptm) == NULL) {
-    sprintf(buf, "NaN");
+  if (taosLocalTime(&quot, &ptm, buf) == NULL) {
     return;
   }
   int32_t length = (int32_t)strftime(ts, 40, "%Y-%m-%dT%H:%M:%S", &ptm);
diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c
index ce647014aee772bed9fc19b01ad3f438d4857743..be87dcd6ff787f426d6445d040131d292d289d48 100644
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
@@ -88,7 +88,7 @@ static void getNextTimeWindow(SInterval* pInterval, STimeWindow* tw, int32_t ord
 
   struct tm tm;
   time_t    t = (time_t)key;
-  taosLocalTime(&t, &tm);
+  taosLocalTime(&t, &tm, NULL);
 
   int mon = (int)(tm.tm_year * 12 + tm.tm_mon + interval * factor);
   tm.tm_year = mon / 12;
diff --git a/source/libs/executor/src/timewindowoperator.c b/source/libs/executor/src/timewindowoperator.c
index fef588a5030f3ec4d2b8a6cf18766590533fcd32..0f2eb4e0d7546e3feadaa690c39db0326df0731b 100644
--- a/source/libs/executor/src/timewindowoperator.c
+++ b/source/libs/executor/src/timewindowoperator.c
@@ -281,7 +281,7 @@ static void getNextTimeWindow(SInterval* pInterval, int32_t precision, int32_t o
 
   struct tm tm;
   time_t    t = (time_t)key;
-  taosLocalTime(&t, &tm);
+  taosLocalTime(&t, &tm, NULL);
 
   int mon = (int)(tm.tm_year * 12 + tm.tm_mon + interval * factor);
   tm.tm_year = mon / 12;
diff --git a/source/libs/function/src/builtins.c b/source/libs/function/src/builtins.c
index f78b8039a471c1b9177d8992eaea5f2df1fcb7d1..22af82bceb5c713c6bbcb65c9aa7393121985302 100644
--- a/source/libs/function/src/builtins.c
+++ b/source/libs/function/src/builtins.c
@@ -213,8 +213,7 @@ static int32_t addTimezoneParam(SNodeList* pList) {
   char      buf[6] = {0};
   time_t    t = taosTime(NULL);
   struct tm tmInfo;
-  if (taosLocalTime(&t, &tmInfo) == NULL) {
-    sprintf(buf, "NaN");
+  if (taosLocalTime(&t, &tmInfo, buf) == NULL) {
   } else {
     strftime(buf, sizeof(buf), "%z", &tmInfo);
   }
diff --git a/source/libs/scalar/src/sclfunc.c b/source/libs/scalar/src/sclfunc.c
index 7f19cb78316a561588a8a15ddd37e0a4189af020..88362201b4da128a324ac703137575de76539dfb 100644
--- a/source/libs/scalar/src/sclfunc.c
+++ b/source/libs/scalar/src/sclfunc.c
@@ -1069,8 +1069,7 @@ int32_t toISO8601Function(SScalarParam *pInput, int32_t inputNum, SScalarParam *
     struct tm tmInfo;
     int32_t len = 0;
 
-    if (taosLocalTime((const time_t *)&timeVal, &tmInfo) == NULL) {
-      sprintf(buf, "NaN");
+    if (taosLocalTime((const time_t *)&timeVal, &tmInfo, buf) == NULL) {
       len = (int32_t)strlen(buf);
       goto _end;
     }
diff --git a/source/os/src/osTime.c b/source/os/src/osTime.c
index 5d5bff8c4875bc6ee834ad3abcfcc440fe0de403..f120b6650a613dfb46003c85819c0551a3008de2 100644
--- a/source/os/src/osTime.c
+++ b/source/os/src/osTime.c
@@ -407,12 +407,21 @@ time_t taosMktime(struct tm *timep) {
 #endif
 }
 
-struct tm *taosLocalTime(const time_t *timep, struct tm *result) {
+struct tm *taosLocalTime(const time_t *timep, struct tm *result, char *buf) {
+  struct tm *res = NULL;
+
   if (result == NULL) {
-    return localtime(timep);
+    res = localtime(timep);
+    if (res == NULL && buf != NULL) {
+      sprintf(buf, "NaN");
+    }
+    return res;
   }
 #ifdef WINDOWS
   if (*timep < 0) {
+    if (buf != NULL) {
+      sprintf(buf, "NaN");
+    }
     return NULL;
     // TODO: bugs in following code
     SYSTEMTIME    ss, s;
@@ -421,6 +430,9 @@ struct tm *taosLocalTime(const time_t *timep, struct tm *result) {
     struct tm     tm1;
     time_t        tt = 0;
     if (localtime_s(&tm1, &tt) != 0 ) {
+      if (buf != NULL) {
+        sprintf(buf, "NaN");
+      }
       return NULL;
     }
     ss.wYear = tm1.tm_year + 1900;
@@ -449,11 +461,17 @@ struct tm *taosLocalTime(const time_t *timep, struct tm *result) {
     result->tm_isdst = 0;
   } else {
     if (localtime_s(result, timep) != 0) {
+      if (buf != NULL) {
+        sprintf(buf, "NaN");
+      }
       return NULL;
     }
   }
 #else
-  localtime_r(timep, result);
+  res = localtime_r(timep, result);
+  if (res == NULL && buf != NULL) {
+    sprintf(buf, "NaN");
+  }
 #endif
   return result;
 }
diff --git a/source/os/src/osTimezone.c b/source/os/src/osTimezone.c
index ad223bff27de80a454d09215926dcdf44e95c23c..cd6ad7cdb5b45c35bae19093a2a97b0c0d8e9bdf 100644
--- a/source/os/src/osTimezone.c
+++ b/source/os/src/osTimezone.c
@@ -893,7 +893,7 @@ void taosGetSystemTimezone(char *outTimezoneStr, enum TdTimezone *tsTimezone) {
    */
   time_t    tx1 = taosGetTimestampSec();
   struct tm tm1;
-  taosLocalTime(&tx1, &tm1);
+  taosLocalTime(&tx1, &tm1, NULL);
   daylight = tm1.tm_isdst;
 
   /*
@@ -921,7 +921,7 @@ void taosGetSystemTimezone(char *outTimezoneStr, enum TdTimezone *tsTimezone) {
          */
         time_t    tx1 = taosGetTimestampSec();
         struct tm tm1;
-        taosLocalTime(&tx1, &tm1);
+        taosLocalTime(&tx1, &tm1, NULL);
         /* load time zone string from /etc/timezone */
         // FILE *f = fopen("/etc/timezone", "r");
         errno = 0;
@@ -1008,7 +1008,7 @@ void taosGetSystemTimezone(char *outTimezoneStr, enum TdTimezone *tsTimezone) {
    */
   time_t    tx1 = taosGetTimestampSec();
   struct tm tm1;
-  taosLocalTime(&tx1, &tm1);
+  taosLocalTime(&tx1, &tm1, NULL);
 
   /*
    * format example:
diff --git a/source/util/src/tlog.c b/source/util/src/tlog.c
index bd9ea058b4f911d5060c85b9303afb3d2cc5dbdb..a3d3c399abcd6040cf042dec045024549e2d3179 100644
--- a/source/util/src/tlog.c
+++ b/source/util/src/tlog.c
@@ -121,7 +121,7 @@ static FORCE_INLINE void taosUpdateDaylight() {
   struct timeval timeSecs;
   taosGetTimeOfDay(&timeSecs);
   time_t curTime = timeSecs.tv_sec;
-  ptm = taosLocalTime(&curTime, &Tm);
+  ptm = taosLocalTime(&curTime, &Tm, NULL);
   tsDaylightActive = ptm->tm_isdst;
 }
 static FORCE_INLINE int32_t taosGetDaylight() { return tsDaylightActive; }
@@ -437,7 +437,7 @@ static inline int32_t taosBuildLogHead(char *buffer, const char *flags) {
 
   taosGetTimeOfDay(&timeSecs);
   time_t curTime = timeSecs.tv_sec;
-  ptm = taosLocalTime(&curTime, &Tm);
+  ptm = taosLocalTime(&curTime, &Tm, NULL);
 
   return sprintf(buffer, "%02d/%02d %02d:%02d:%02d.%06d %08" PRId64 " %s", ptm->tm_mon + 1, ptm->tm_mday, ptm->tm_hour,
                  ptm->tm_min, ptm->tm_sec, (int32_t)timeSecs.tv_usec, taosGetSelfPthreadId(), flags);
diff --git a/tools/shell/src/shellEngine.c b/tools/shell/src/shellEngine.c
index a87ba162679eb97113055752de26e6a36a56ada3..616540a54a7cd42ec48c8c94e7d03c0d86765225 100644
--- a/tools/shell/src/shellEngine.c
+++ b/tools/shell/src/shellEngine.c
@@ -291,8 +291,7 @@ char *shellFormatTimestamp(char *buf, int64_t val, int32_t precision) {
   }
 
   struct tm ptm = {0};
-  if (taosLocalTime(&tt, &ptm) == NULL) {
-    sprintf(buf, "NaN");
+  if (taosLocalTime(&tt, &ptm, buf) == NULL) {
     return buf;
   }
   size_t     pos = strftime(buf, 35, "%Y-%m-%d %H:%M:%S", &ptm);
diff --git a/utils/test/c/tmqDemo.c b/utils/test/c/tmqDemo.c
index d105b505793eae17068af9e9db02eff5071f5bd4..ce069c2b05878cb6806f2784be896942cb701ae4 100644
--- a/utils/test/c/tmqDemo.c
+++ b/utils/test/c/tmqDemo.c
@@ -597,7 +597,7 @@ void printParaIntoFile() {
 
   time_t    tTime = taosGetTimestampSec();
   struct tm tm;
-  taosLocalTime(&tTime, &tm);
+  taosLocalTime(&tTime, &tm, NULL);
 
   taosFprintfFile(pFile, "###################################################################\n");
   taosFprintfFile(pFile, "# configDir:                %s\n", configDir);
diff --git a/utils/test/c/tmqSim.c b/utils/test/c/tmqSim.c
index 5eeb0aaa12f508656c34c82fbab7a1053b46a410..f2de219f4e740b090a87ebbb7e9ceb9cb1c6dcc2 100644
--- a/utils/test/c/tmqSim.c
+++ b/utils/test/c/tmqSim.c
@@ -166,7 +166,7 @@ static void printHelp() {
 char* getCurrentTimeString(char* timeString) {
   time_t    tTime = taosGetTimestampSec();
   struct tm tm;
-  taosLocalTime(&tTime, &tm);
+  taosLocalTime(&tTime, &tm, NULL);
   sprintf(timeString, "%d-%02d-%02d %02d:%02d:%02d", tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour,
           tm.tm_min, tm.tm_sec);
 
@@ -472,8 +472,7 @@ static char* shellFormatTimestamp(char* buf, int64_t val, int32_t precision) {
   }
 
   struct tm ptm;
-  if (taosLocalTime(&tt, &ptm) == NULL) {
-    sprintf(buf, "NaN");
+  if (taosLocalTime(&tt, &ptm, buf) == NULL) {
     return buf;
   }
   size_t pos = strftime(buf, 35, "%Y-%m-%d %H:%M:%S", &ptm);
diff --git a/utils/tsim/src/simExe.c b/utils/tsim/src/simExe.c
index 07b3648f3a993e3dfb66e5e598f562863db83b92..1be28635ef721167d67a33e7837f782c70e17d49 100644
--- a/utils/tsim/src/simExe.c
+++ b/utils/tsim/src/simExe.c
@@ -772,8 +772,7 @@ bool simExecuteNativeSqlCommand(SScript *script, char *rest, bool isSlow) {
                 tt = (*(int64_t *)row[i]) / 1000000000;
               }
 
-              if (taosLocalTime(&tt, &tp) == NULL) {
-                sprintf(timeStr, "NaN");
+              if (taosLocalTime(&tt, &tp, timeStr) == NULL) {
                 break;
               }
               strftime(timeStr, 64, "%y-%m-%d %H:%M:%S", &tp);