locale.c: Add mutex lock around _wsetlocale() call

The lock expands to nothing if unthreaded, or thread-local storage is in
effect.  But otherwise protects a global value from being clobbered by
another thread.

2 files changed, 8 insertions, 0 deletions

diff --git a/locale.c b/locale.c
index 93f97b1082..8c98b3269c 100644
--- a/locale.c
+++ b/locale.c
@@ -2609,14 +2609,18 @@ S_wrap_wsetlocale(pTHX_ const int category, const char *locale)
         }
     }
 
+    WSETLOCALE_LOCK;
     const wchar_t * wresult = _wsetlocale(category, wlocale);
     Safefree(wlocale);
 
     if (! wresult) {
+        WSETLOCALE_UNLOCK;
         return NULL;
     }
 
     const char * result = Win_wstring_to_utf8_string(wresult);
+    WSETLOCALE_UNLOCK;
+
     SAVEFREEPV(result); /* is there something better we can do here? */
 
     return result;
diff --git a/perl.h b/perl.h
index 72254a1578..98bdf94b27 100644
--- a/perl.h
+++ b/perl.h
@@ -7128,6 +7128,10 @@ the plain locale pragma without a parameter (S<C<use locale>>) is in effect.
 #  define POSIX_SETLOCALE_UNLOCK    gwLOCALE_UNLOCK
 #endif
 
+/* It handles _wsetlocale() as well */
+#define WSETLOCALE_LOCK      POSIX_SETLOCALE_LOCK
+#define WSETLOCALE_UNLOCK    POSIX_SETLOCALE_UNLOCK
+
 /* Similar to gwLOCALE_LOCK, there are functions that require both the locale
  * and environment to be constant during their execution, and don't change
  * either of those things, but do write to some sort of shared global space.