2008-12-21  Bruno Haible  <bruno@clisp.org>
	[BZ #9677]
	* wcsmbs/mbsnrtowcs.c (__mbsnrtowcs): Create temporary state object
	if no output is written.
This commit is contained in:
Ulrich Drepper 2008-12-26 19:02:29 +00:00
parent f38113e1b9
commit bf93cd3b8d
3 changed files with 12 additions and 2 deletions

View File

@ -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> 2008-12-13 Klaus Dittrich <kladit@arcor.de>
* login/utmp_file.c (pututline_file): Replace call to dup2 with * login/utmp_file.c (pututline_file): Replace call to dup2 with

View File

@ -1,6 +1,6 @@
2008-12-26 Ulrich Drepper <drepper@redhat.com> 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. length constant.
2008-12-05 Ulrich Drepper <drepper@redhat.com> 2008-12-05 Ulrich Drepper <drepper@redhat.com>

View File

@ -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. This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.org>, 1996. 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. */ /* We have to handle DST == NULL special. */
if (dst == NULL) if (dst == NULL)
{ {
mbstate_t temp_state;
wchar_t buf[64]; /* Just an arbitrary size. */ wchar_t buf[64]; /* Just an arbitrary size. */
const unsigned char *inbuf = (const unsigned char *) *src; const unsigned char *inbuf = (const unsigned char *) *src;
temp_state = *data.__statep;
data.__statep = &temp_state;
result = 0; result = 0;
data.__outbufend = (unsigned char *) buf + sizeof (buf); data.__outbufend = (unsigned char *) buf + sizeof (buf);
do do