From 507145d78595e052ce13368e122f72c85093992c Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Sun, 27 Nov 2016 15:11:49 -0800 Subject: [PATCH] Fix race when accessing std::locale::classic() See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78552 --- src/utiltime.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/utiltime.cpp b/src/utiltime.cpp index da590f888..51d545ef8 100644 --- a/src/utiltime.cpp +++ b/src/utiltime.cpp @@ -74,8 +74,9 @@ void MilliSleep(int64_t n) std::string DateTimeStrFormat(const char* pszFormat, int64_t nTime) { + static std::locale classic(std::locale::classic()); // std::locale takes ownership of the pointer - std::locale loc(std::locale::classic(), new boost::posix_time::time_facet(pszFormat)); + std::locale loc(classic, new boost::posix_time::time_facet(pszFormat)); std::stringstream ss; ss.imbue(loc); ss << boost::posix_time::from_time_t(nTime);