[commits] r7613 - in /fsf/trunk/libc: ChangeLog localedata/ChangeLog localedata/tests-mbwc/tst_types.h wcsmbs/mbsnrtowcs.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sat Dec 27 00:02:20 2008
New Revision: 7613

Log:
Import glibc-mainline for 2008-12-27

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/localedata/ChangeLog
    fsf/trunk/libc/localedata/tests-mbwc/tst_types.h
    fsf/trunk/libc/wcsmbs/mbsnrtowcs.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sat Dec 27 00:02:20 2008
@@ -1,3 +1,9 @@
+2008-12-21  Bruno Haible  <bruno@xxxxxxxxx>
+
+	[BZ #9677]
+	* wcsmbs/mbsnrtowcs.c (__mbsnrtowcs): Create temporary state object
+	if no output is written.
+
 2008-12-13  Klaus Dittrich  <kladit@xxxxxxxx>
 
 	* login/utmp_file.c (pututline_file): Replace call to dup2 with

Modified: fsf/trunk/libc/localedata/ChangeLog
==============================================================================
--- fsf/trunk/libc/localedata/ChangeLog (original)
+++ fsf/trunk/libc/localedata/ChangeLog Sat Dec 27 00:02:20 2008
@@ -1,3 +1,8 @@
+2008-12-26  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* tests-mbwc/tst_types.h (TIN_MBRLEN_REC): Use correct array
+	length constant.
+
 2008-12-05  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* SUPPORTED (SUPPORTED-LOCALES): Add hne_IN.

Modified: fsf/trunk/libc/localedata/tests-mbwc/tst_types.h
==============================================================================
--- fsf/trunk/libc/localedata/tests-mbwc/tst_types.h (original)
+++ fsf/trunk/libc/localedata/tests-mbwc/tst_types.h Sat Dec 27 00:02:20 2008
@@ -122,7 +122,7 @@
     int t_flg;
     int t_init;
   }
-  seq[WCSTOK_SEQNUM];
+  seq[MBRLEN_SEQNUM];
 }
 TIN_MBRLEN_REC;
 

Modified: fsf/trunk/libc/wcsmbs/mbsnrtowcs.c
==============================================================================
--- fsf/trunk/libc/wcsmbs/mbsnrtowcs.c (original)
+++ fsf/trunk/libc/wcsmbs/mbsnrtowcs.c Sat Dec 27 00:02:20 2008
@@ -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@xxxxxxx>, 1996.
 
@@ -79,8 +79,12 @@
   /* 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);