about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2008-12-26 19:02:29 +0000
committerUlrich Drepper <drepper@redhat.com>2008-12-26 19:02:29 +0000
commitbf93cd3b8d6643977078c4b67facc0bbb85b03be (patch)
tree07f2bdd1b9a3957f3ba86d861d6ffaf6f17abe9f
parentf38113e1b9e25ec998f48b6c2efaabbcf5dd4317 (diff)
downloadglibc-bf93cd3b8d6643977078c4b67facc0bbb85b03be.tar.gz
glibc-bf93cd3b8d6643977078c4b67facc0bbb85b03be.tar.xz
glibc-bf93cd3b8d6643977078c4b67facc0bbb85b03be.zip
[BZ #9677]
2008-12-21  Bruno Haible  <bruno@clisp.org>
	[BZ #9677]
	* wcsmbs/mbsnrtowcs.c (__mbsnrtowcs): Create temporary state object
	if no output is written.
-rw-r--r--ChangeLog6
-rw-r--r--localedata/ChangeLog2
-rw-r--r--wcsmbs/mbsnrtowcs.c6
3 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9ea040c96f..ef81776cc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-21  Bruno Haible  <bruno@clisp.org>
+
+	[BZ #9677]
+	* wcsmbs/mbsnrtowcs.c (__mbsnrtowcs): Create temporary state object
+	if no output is written.
+
 2008-12-13  Klaus Dittrich  <kladit@arcor.de>
 
 	* login/utmp_file.c (pututline_file): Replace call to dup2 with
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 2f3e26c584..6a7735b514 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,6 +1,6 @@
 2008-12-26  Ulrich Drepper  <drepper@redhat.com>
 
-	* tests-mbwc/tst_types.h (TIN)MBRLEN_REC): Use correct array
+	* tests-mbwc/tst_types.h (TIN_MBRLEN_REC): Use correct array
 	length constant.
 
 2008-12-05  Ulrich Drepper  <drepper@redhat.com>
diff --git a/wcsmbs/mbsnrtowcs.c b/wcsmbs/mbsnrtowcs.c
index 8d0b9d3609..a5329a2331 100644
--- a/wcsmbs/mbsnrtowcs.c
+++ b/wcsmbs/mbsnrtowcs.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2000, 2002, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2000, 2002, 2005, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.org>, 1996.
 
@@ -79,9 +79,13 @@ __mbsnrtowcs (dst, src, nmc, len, ps)
   /* We have to handle DST == NULL special.  */
   if (dst == NULL)
     {
+      mbstate_t temp_state;
       wchar_t buf[64];		/* Just an arbitrary size.  */
       const unsigned char *inbuf = (const unsigned char *) *src;
 
+      temp_state = *data.__statep;
+      data.__statep = &temp_state;
+
       result = 0;
       data.__outbufend = (unsigned char *) buf + sizeof (buf);
       do