drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* libc/stdio/fgetws.c (_fgetws_r): Call _mbsnrtowcs_r rather than 

_mbsrtowcs_r and restrict number of wide chars to n - 1.
This commit is contained in:
Corinna Vinschen 2012-05-30 14:42:52 +00:00
parent 0b592aeef2
commit 53bbfeed98
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
newlib/ChangeLog
View File

@ -1,3 +1,8 @@
2012-05-30 Corinna Vinschen <vinschen@redhat.com>
* libc/stdio/fgetws.c (_fgetws_r): Call _mbsnrtowcs_r rather than
_mbsrtowcs_r and restrict number of wide chars to n - 1.
2012-05-30 Corinna Vinschen <vinschen@redhat.com> 2012-05-30 Corinna Vinschen <vinschen@redhat.com>
* libc/stdio/local.h (_newlib_flockfile_start): New macro to * libc/stdio/local.h (_newlib_flockfile_start): New macro to

10
newlib/libc/stdio/fgetws.c
View File

@ -110,9 +110,13 @@ _DEFUN(_fgetws_r, (ptr, ws, n, fp),
{ {
src = (char *) fp->_p; src = (char *) fp->_p;
nl = memchr (fp->_p, '\n', fp->_r); nl = memchr (fp->_p, '\n', fp->_r);
nconv = _mbsrtowcs_r (ptr, wsp, &src, nconv = _mbsnrtowcs_r (ptr, wsp, &src,
nl != NULL ? (nl - fp->_p + 1) : fp->_r, /* Read all bytes up to the next NL, or up to the
&fp->_mbstate); end of the buffer if there is no NL. */
nl != NULL ? (nl - fp->_p + 1) : fp->_r,
/* But never more than n - 1 wide chars. */
n - 1,
&fp->_mbstate);
if (nconv == (size_t) -1) if (nconv == (size_t) -1)
/* Conversion error */ /* Conversion error */
goto error; goto error;