* wcsmbs/wcsnrtombs.c (__wcsnrtombs): Create temporary state object

if no output is written.
git-mirror · Jan 2, 2009 · 7209811 · 7209811
1 parent 623d0bf
commit 7209811
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,8 @@
 2009-01-02  Ulrich Drepper  <drepper@redhat.com>
 
+	* wcsmbs/wcsnrtombs.c (__wcsnrtombs): Create temporary state object
+	if no output is written.
+
 	* version.h: Bump to 2.10 development.
 
 	* posix/getconf.c: Update copyright year.

diff --git a/wcsmbs/wcsnrtombs.c b/wcsmbs/wcsnrtombs.c
@@ -77,10 +77,14 @@ __wcsnrtombs (dst, src, nwc, len, ps)
   /* We have to handle DST == NULL special.  */
   if (dst == NULL)
     {
+      mbstate_t temp_state;
       unsigned char buf[256];		/* Just an arbitrary value.  */
       const unsigned char *inbuf = (const unsigned char *) *src;
       size_t dummy;
 
+      temp_state = *data.__statep;
+      data.__statep = &temp_state;
+
       result = 0;
       data.__outbufend = buf + sizeof (buf);