localtime_thread_safe, PYBIND11_COMPAT_STRDUP

Author: rwgk

include/pybind11/chrono.h

@@ -11,9 +11,13 @@
 #pragma once
 
 #include "pybind11.h"
-#include <cmath>
-#include <ctime>
+
 #include <chrono>
+#include <cmath>
+#include <mutex>
+
+#include <time.h>
+
 #include <datetime.h>
 
 // Backport the PyDateTime_DELTA functions from Python3.3 if required
@@ -95,6 +99,22 @@ template <typename type> class duration_caster {
     PYBIND11_TYPE_CASTER(type, _("datetime.timedelta"));
 };
 
+inline std::tm *localtime_thread_safe(const std::time_t *time, std::tm *buf) {
+#if defined(__STDC_WANT_LIB_EXT1__) || defined(_MSC_VER)
+    if (localtime_s(buf, time))
+        return nullptr;
+    return buf;
+#else
+    static std::mutex mtx;
+    std::lock_guard<std::mutex> lock(mtx);
+    std::tm *tm_ptr = localtime(time);
+    if (tm_ptr != nullptr) {
+        *buf = *tm_ptr;
+    }
+    return tm_ptr;
+#endif
+}
+
 // This is for casting times on the system clock into datetime.datetime instances
 template <typename Duration> class type_caster<std::chrono::time_point<std::chrono::system_clock, Duration>> {
 public:
@@ -162,23 +182,10 @@ template <typename Duration> class type_caster<std::chrono::time_point<std::chro
         // (https://en.cppreference.com/w/cpp/chrono/system_clock/to_time_t)
         std::time_t tt = system_clock::to_time_t(time_point_cast<system_clock::duration>(src - us));
 
-        // std::localtime returns a pointer to a static internal std::tm object on success,
-        // or null pointer otherwise
-#if defined(_MSC_VER)
-#    pragma warning(push)
-#    pragma warning(disable : 4996) // warning C4996: The POSIX name for this item is deprecated.
-#endif
-        std::tm *localtime_ptr = std::localtime(&tt);
-#if defined(_MSC_VER)
-#    pragma warning(pop)
-#endif
+        std::tm localtime;
+        std::tm *localtime_ptr = localtime_thread_safe(&tt, &localtime);
         if (!localtime_ptr)
             throw cast_error("Unable to represent system_clock in local time");
-
-        // this function uses static memory so it's best to copy it out asap just in case
-        // otherwise other code that is using localtime may break this (not just python code)
-        std::tm localtime = *localtime_ptr;
-
         return PyDateTime_FromDateAndTime(localtime.tm_year + 1900,
                                           localtime.tm_mon + 1,
                                           localtime.tm_mday,

include/pybind11/detail/common.h

@@ -125,6 +125,11 @@
 #  endif
 #endif
 
+// https://en.cppreference.com/w/c/chrono/localtime
+#if defined(__STDC_LIB_EXT1__) && !defined(__STDC_WANT_LIB_EXT1__)
+#    define __STDC_WANT_LIB_EXT1__
+#endif
+
 #include <Python.h>
 #include <frameobject.h>
 #include <pythread.h>

include/pybind11/pybind11.h

@@ -78,14 +78,9 @@ inline bool apply_exception_translators(std::forward_list<ExceptionTranslator>&
 }
 
 #if defined(_MSC_VER)
-#    pragma warning(push)
-#    pragma warning(disable : 4996) // warning C4996: The POSIX name for this item is deprecated.
-#endif
-
-inline char *strdup_helper(const char *s) { return strdup(s); }
-
-#if defined(_MSC_VER)
-#    pragma warning(pop)
+#    define PYBIND11_COMPAT_STRDUP _strdup
+#else
+#    define PYBIND11_COMPAT_STRDUP strdup
 #endif
 
 PYBIND11_NAMESPACE_END(detail)
@@ -287,7 +282,7 @@ class cpp_function : public function {
                 std::free(s);
         }
         char *operator()(const char *s) {
-            auto t = detail::strdup_helper(s);
+            auto t = PYBIND11_COMPAT_STRDUP(s);
             strings.push_back(t);
             return t;
         }
@@ -532,7 +527,7 @@ class cpp_function : public function {
         std::free(const_cast<char *>(func->m_ml->ml_doc));
         // Install docstring if it's non-empty (when at least one option is enabled)
         func->m_ml->ml_doc
-            = signatures.empty() ? nullptr : detail::strdup_helper(signatures.c_str());
+            = signatures.empty() ? nullptr : PYBIND11_COMPAT_STRDUP(signatures.c_str());
 
         if (rec->is_method) {
             m_ptr = PYBIND11_INSTANCE_METHOD_NEW(m_ptr, rec->scope.ptr());
@@ -1537,15 +1532,15 @@ class class_ : public detail::generic_type {
            detail::process_attributes<Extra...>::init(extra..., rec_fget);
            if (rec_fget->doc && rec_fget->doc != doc_prev) {
               free(doc_prev);
-              rec_fget->doc = detail::strdup_helper(rec_fget->doc);
+              rec_fget->doc = PYBIND11_COMPAT_STRDUP(rec_fget->doc);
            }
         }
         if (rec_fset) {
             char *doc_prev = rec_fset->doc;
             detail::process_attributes<Extra...>::init(extra..., rec_fset);
             if (rec_fset->doc && rec_fset->doc != doc_prev) {
                 free(doc_prev);
-                rec_fset->doc = detail::strdup_helper(rec_fset->doc);
+                rec_fset->doc = PYBIND11_COMPAT_STRDUP(rec_fset->doc);
             }
             if (! rec_active) rec_active = rec_fset;
         }