use wxLocaltime_r() instead of localtime(): this is safer and localtime() isn't avail...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/log.cpp b/src/common/log.cpp
index c4d3ef212b5744023f02a31066af368d2bf0f397..b24d5dc538aec711bb2588e2e90d0c463ec45fb3 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -416,7 +416,10 @@ void wxLog::TimeStamp(wxString *str)
         wxChar buf[256];
         time_t timeNow;
         (void)time(&timeNow);
-        wxStrftime(buf, WXSIZEOF(buf), ms_timestamp, localtime(&timeNow));
+
+        struct tm tm;
+        wxStrftime(buf, WXSIZEOF(buf),
+                    ms_timestamp, wxLocaltime_r(&timeNow, &tm));
 
         str->Empty();
         *str << buf << wxT(": ");

diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
index 50e1457c19b354350e8104ba7d823f22c414a8f3..ba6dd538f54467a45167ef9ab9b16986962e8e2e 100644 (file)
--- a/src/generic/logg.cpp
+++ b/src/generic/logg.cpp
@@ -82,7 +82,8 @@
 static wxString TimeStamp(const wxChar *format, time_t t)
 {
     wxChar buf[4096];
-    if ( !wxStrftime(buf, WXSIZEOF(buf), format, localtime(&t)) )
+    struct tm tm;
+    if ( !wxStrftime(buf, WXSIZEOF(buf), format, wxLocaltime_r(&t, &tm)) )
     {
         // buffer is too small?
         wxFAIL_MSG(_T("strftime() failed"));