8 files changed, 16 insertions, 0 deletions
diff --git a/wcsmbs/btowc.c b/wcsmbs/btowc.c
index cca4645c19..b6a682897b 100644
--- a/wcsmbs/btowc.c
+++ b/wcsmbs/btowc.c
@@ -43,6 +43,8 @@ __btowc (c)
   /* Tell where we want the result.  */
   data.outbuf = (char *) buf;
   data.outbufend = data.outbuf + sizeof (wchar_t);
+  data.invocation_counter = 0;
+  data.internal_use = 1;
   data.is_last = 1;
   data.statep = &data.__state;
 
diff --git a/wcsmbs/mbrtowc.c b/wcsmbs/mbrtowc.c
index 1dcaf968ea..837b42f1f1 100644
--- a/wcsmbs/mbrtowc.c
+++ b/wcsmbs/mbrtowc.c
@@ -45,6 +45,8 @@ __mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
   /* Tell where we want the result.  */
   data.outbuf = outbuf;
   data.outbufend = outbuf + sizeof (wchar_t);
+  data.invocation_counter = 0;
+  data.internal_use = 1;
   data.is_last = 1;
   data.statep = ps ?: &state;
 
diff --git a/wcsmbs/mbsnrtowcs.c b/wcsmbs/mbsnrtowcs.c
index a73fcd1e98..fbebc8de4c 100644
--- a/wcsmbs/mbsnrtowcs.c
+++ b/wcsmbs/mbsnrtowcs.c
@@ -50,6 +50,8 @@ __mbsnrtowcs (dst, src, nmc, len, ps)
   int status;
 
   /* Tell where we want the result.  */
+  data.invocation_counter = 0;
+  data.internal_use = 1;
   data.is_last = 1;
   data.statep = ps ?: &state;
 
diff --git a/wcsmbs/mbsrtowcs.c b/wcsmbs/mbsrtowcs.c
index bad27bab98..1993e2e702 100644
--- a/wcsmbs/mbsrtowcs.c
+++ b/wcsmbs/mbsrtowcs.c
@@ -46,6 +46,8 @@ __mbsrtowcs (dst, src, len, ps)
   int status;
 
   /* Tell where we want the result.  */
+  data.invocation_counter = 0;
+  data.internal_use = 1;
   data.is_last = 1;
   data.statep = ps ?: &state;
 
diff --git a/wcsmbs/wcrtomb.c b/wcsmbs/wcrtomb.c
index 6fd33e06b3..9f3c303e2a 100644
--- a/wcsmbs/wcrtomb.c
+++ b/wcsmbs/wcrtomb.c
@@ -45,6 +45,8 @@ __wcrtomb (char *s, wchar_t wc, mbstate_t *ps)
   /* Tell where we want the result.  */
   data.outbuf = s;
   data.outbufend = s + MB_CUR_MAX;
+  data.invocation_counter = 0;
+  data.internal_use = 1;
   data.is_last = 1;
   data.statep = ps ?: &state;
 
diff --git a/wcsmbs/wcsnrtombs.c b/wcsmbs/wcsnrtombs.c
index eb4a96daad..ab74e30927 100644
--- a/wcsmbs/wcsnrtombs.c
+++ b/wcsmbs/wcsnrtombs.c
@@ -49,6 +49,8 @@ __wcsnrtombs (dst, src, nwc, len, ps)
   size_t result = 0;
 
   /* Tell where we want the result.  */
+  data.invocation_counter = 0;
+  data.internal_use = 1;
   data.is_last = 1;
   data.statep = ps ?: &state;
 
diff --git a/wcsmbs/wcsrtombs.c b/wcsmbs/wcsrtombs.c
index 27b1df8f6d..b40d14318a 100644
--- a/wcsmbs/wcsrtombs.c
+++ b/wcsmbs/wcsrtombs.c
@@ -45,6 +45,8 @@ __wcsrtombs (dst, src, len, ps)
   size_t result = 0;
 
   /* Tell where we want the result.  */
+  data.invocation_counter = 0;
+  data.internal_use = 1;
   data.is_last = 1;
   data.statep = ps ?: &state;
 
diff --git a/wcsmbs/wctob.c b/wcsmbs/wctob.c
index 7376538ad9..8cbcbe41c3 100644
--- a/wcsmbs/wctob.c
+++ b/wcsmbs/wctob.c
@@ -38,6 +38,8 @@ wctob (c)
   /* Tell where we want the result.  */
   data.outbuf = buf;
   data.outbufend = buf + MB_LEN_MAX;
+  data.invocation_counter = 0;
+  data.internal_use = 1;
   data.is_last = 1;
   data.statep = &data.__state;