JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* regex/regcomp.c (wgetnext): Use size_t as type for n2 since that's

Browse Source 
what's returned by mbrtowc.
	* regex/regexec.c (xmbrtowc): Ditto.
This commit is contained in:
Corinna Vinschen
2010-02-12 20:17:22 +00:00
parent 492f1c3431
commit 6b3f923fe2
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
winsup/cygwin/regex/regexec.c
View File

@@ -88,7 +88,7 @@ xmbrtowc(wint_t *wi, const char *s, size_t n, mbstate_t *mbs, wint_t dummy)
if (sizeof (wchar_t) == 2 && wc >= 0xd800 && wc <= 0xdbff) {
/* UTF-16 surrogate pair. Fetch second half and
compute UTF-32 value */
int n2 = mbrtowc(&wc, s + nr, n - nr, mbs);
size_t n2 = mbrtowc(&wc, s + nr, n - nr, mbs);
if (n2 == 0 || n2 == (size_t)-1 || n2 == (size_t)-2) {
memset(mbs, 0, sizeof(*mbs));
if (wi != NULL)