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

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

View File

@@ -1152,7 +1152,8 @@ wgetnext(struct parse *p)
else 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, p->next + n, p->end - p->next - n, &mbs);
size_t n2 = mbrtowc(&wc, p->next + n,
p->end - p->next - n, &mbs);
if (n2 == 0 || n2 == (size_t)-1 || n2 == (size_t)-2) {
SETERROR(REG_ILLSEQ);
return (0);