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

	if no output is written.

diff --git a/ChangeLog b/ChangeLog
index a7e2db0..450a5b6 100644 (file)
--- 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
index 171fc3c..eead26f 100644 (file)
--- 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);