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

* libc/stdlib/wctob.c (wctob): Reorganize and fix WEOF check. Rename 

pwc to pmb and convert to array to avoid buffer overflow.  Rename c to
	wc.  Check wc for WEOF instead of for EOF.  Return first byte of pmb if
	__wctomb conversion returned exactly one byte, EOF otherwise.
This commit is contained in:
Corinna Vinschen 2010-05-02 11:55:01 +00:00
parent be129c26e2
commit ffa42cf6a0
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
newlib/ChangeLog
View File

@ -1,3 +1,10 @@
2010-05-02 Corinna Vinschen <corinna@vinschen.de>
* libc/stdlib/wctob.c (wctob): Reorganize and fix WEOF check. Rename
pwc to pmb and convert to array to avoid buffer overflow. Rename c to
wc. Check wc for WEOF instead of for EOF. Return first byte of pmb if
__wctomb conversion returned exactly one byte, EOF otherwise.
2010-04-30 Corinna Vinschen <corinna@vinschen.de> 2010-04-30 Corinna Vinschen <corinna@vinschen.de>
* libc/include/langinfo.h: Fix #endif positioning. * libc/include/langinfo.h: Fix #endif positioning.

18
newlib/libc/stdlib/wctob.c
View File

@ -1,26 +1,24 @@
#include <reent.h> #include <reent.h>
#include <wchar.h> #include <wchar.h>
#include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <limits.h>
#include "local.h" #include "local.h"
int int
wctob (wint_t c) wctob (wint_t wc)
{ {
mbstate_t mbs; mbstate_t mbs;
int retval = 0; unsigned char pmb[MB_LEN_MAX];
unsigned char pwc;
if (wc == WEOF)
return EOF;
/* Put mbs in initial state. */ /* Put mbs in initial state. */
memset (&mbs, '\0', sizeof (mbs)); memset (&mbs, '\0', sizeof (mbs));
_REENT_CHECK_MISC(_REENT); _REENT_CHECK_MISC(_REENT);
retval = __wctomb (_REENT, &pwc, c, __locale_charset (), &mbs); return __wctomb (_REENT, (char *) pmb, wc, __locale_charset (), &mbs) == 1
? (int) pmb[0] : EOF;
if (c == EOF || retval != 1)
return WEOF;
else
return (int)pwc;
} }