[Mingw-w64-public] [PATCH 5/9] crt: Move private state_mbrlen/state_mbrtowc/state_mbsrtowcs variables to corresponding functions

[Pali Rohár]

This prevents potential usage of them in incorrect function, as those
variables are local just for a function with global state.
---
 mingw-w64-crt/misc/mbrtowc.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/mingw-w64-crt/misc/mbrtowc.c b/mingw-w64-crt/misc/mbrtowc.c
index 2d89af5132f5..c2b29f64eba2 100644
--- a/mingw-w64-crt/misc/mbrtowc.c
+++ b/mingw-w64-crt/misc/mbrtowc.c
@@ -12,13 +12,6 @@
 #include <errno.h>
 #include <windows.h>
 
-/**
- * Private `mbstate_t` to use if caller did not supply one.
- */
-static mbstate_t state_mbrlen = {0};
-static mbstate_t state_mbrtowc = {0};
-static mbstate_t state_mbsrtowcs = {0};
-
 size_t mbrtowc (
   wchar_t *__restrict__ wc,
   const char *__restrict__ mbs,
@@ -27,6 +20,7 @@ size_t mbrtowc (
 ) {
   /* Use private `mbstate_t` if caller did not supply one */
   if (state == NULL) {
+    static mbstate_t state_mbrtowc = {0};
     state = &state_mbrtowc;
   }
 
@@ -140,6 +134,7 @@ size_t mbrlen (
 ) {
   /* Use private `mbstate_t` if caller did not supply one */
   if (state == NULL) {
+    static mbstate_t state_mbrlen = {0};
     state = &state_mbrlen;
   }
   wchar_t wc = WEOF;
@@ -154,6 +149,7 @@ size_t mbsrtowcs (
 ) {
   /* Use private `mbstate_t` if caller did not supply one */
   if (state == NULL) {
+    static mbstate_t state_mbsrtowcs = {0};
     state = &state_mbsrtowcs;
   }
 
-- 
2.20.1



_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public