PDCLIB-2 PDCLIB-9: Internal mbstates

diff --git a/functions/wchar/mbrtowc.c b/functions/wchar/mbrtowc.c
index 610f828c60df54ee21aa2da78fb35e1ac274a3f2..91fefebc1cc063639ac796e91653f576ab017d60 100644 (file)
--- a/functions/wchar/mbrtowc.c
+++ b/functions/wchar/mbrtowc.c
@@ -79,7 +79,8 @@ size_t mbrtowc(
     mbstate_t *restrict ps
 )
 {
-    return mbrtowc_l(pwc, s, n, ps, _PDCLIB_threadlocale());
+    static mbstate_t st;
+    return mbrtowc_l(pwc, s, n, ps ? ps : &st, _PDCLIB_threadlocale());
 }
 
 #endif

diff --git a/functions/wchar/wcrtomb.c b/functions/wchar/wcrtomb.c
index e692923c53121d322f31f679845bb8c9b09d1ea2..0372471957d557a7246f9c360df89cbba15b7f43 100644 (file)
--- a/functions/wchar/wcrtomb.c
+++ b/functions/wchar/wcrtomb.c
@@ -32,7 +32,8 @@ size_t wcrtomb(
     mbstate_t   *restrict   ps
 )
 {
-    return _PDCLIB_cwcrtomb(s, wc, ps);
+    static mbstate_t st;
+    return _PDCLIB_cwcrtomb(s, wc, ps ? ps : &st);
 }
 
 #endif