fix various bugs in new integer parser framework

[musl] / src / stdlib / wcstoimax.c

diff --git a/src/stdlib/wcstoimax.c b/src/stdlib/wcstoimax.c
index b83206b..344fe3a 100644 (file)
--- a/src/stdlib/wcstoimax.c
+++ b/src/stdlib/wcstoimax.c
@@ -6,8 +6,8 @@
 
 intmax_t wcstoimax(const wchar_t *s, wchar_t **p, int base)
 {
+       const wchar_t *s1 = s;
        struct intparse ip = {0};
-       unsigned char tmp;
 
        if (p) *p = (wchar_t *)s;
 
@@ -19,14 +19,14 @@ intmax_t wcstoimax(const wchar_t *s, wchar_t **p, int base)
        for (; iswspace(*s); s++);
 
        ip.base = base;
-       for (; *s<256 && (tmp=*s, __intparse(&ip, &tmp, 1)); s++);
+       for (; __intparse(&ip, (char[]){(*s&-(*s<128U))}, 1); s++);
 
        if (p && ip.err != EINVAL)
-               *p = (wchar_t *)s;
+               *p = (wchar_t *)s1 + ip.cnt;
 
        if (ip.err) {
                errno = ip.err;
-               if (ip.err = EINVAL) return 0;
+               if (ip.err == EINVAL) return 0;
                return ip.neg ? INTMAX_MIN : INTMAX_MAX;
        }