commit fd9f155df92d588cecd4c4f10759433de5e4b303
author Lalit Maganti <lalitm@google.com> Fri Nov 15 12:00:13 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 15 12:00:13 2024 +0000
tree eb7018d022cc746a6dc7091c084d27c96e4c0e67
parent 6cdc068c2443741164872cdf5e789fe040d155b0
parent ee6cc386ea7b6b1ad80398bf75e23c0e7a5a1b87

Merge "base: rm non-thread-safe `localtime` function" into main

src/base/time.cc

diff --git a/src/base/time.cc b/src/base/time.cc
index e799542..ad971af 100644
--- a/src/base/time.cc
+++ b/src/base/time.cc
@@ -188,10 +188,15 @@
 std::string GetTimeFmt(const std::string& fmt) {
   time_t raw_time;
   time(&raw_time);
-  struct tm* local_tm;
-  local_tm = localtime(&raw_time);
+  struct tm local_tm;
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+  PERFETTO_CHECK(localtime_s(&local_tm, &raw_time) == 0);
+#else
+  tzset();
+  PERFETTO_CHECK(localtime_r(&raw_time, &local_tm) != nullptr);
+#endif
   char buf[128];
-  PERFETTO_CHECK(strftime(buf, 80, fmt.c_str(), local_tm) > 0);
+  PERFETTO_CHECK(strftime(buf, 80, fmt.c_str(), &local_tm) > 0);
   return buf;
 }