mirror of
https://github.com/fluencelabs/musl
synced 2025-06-25 04:31:56 +00:00
fix wcsto[iu]max with high characters
stopping without letting the parser see a stop character prevented getting a result. so treat all high chars as the null character and pass them into the parser. also eliminated ugly tmp var using compound literals.
This commit is contained in:
@ -7,7 +7,6 @@
|
||||
intmax_t wcstoimax(const wchar_t *s, wchar_t **p, int base)
|
||||
{
|
||||
struct intparse ip = {0};
|
||||
unsigned char tmp;
|
||||
|
||||
if (p) *p = (wchar_t *)s;
|
||||
|
||||
@ -19,7 +18,7 @@ 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;
|
||||
|
@ -8,7 +8,6 @@
|
||||
uintmax_t wcstoumax(const wchar_t *s, wchar_t **p, int base)
|
||||
{
|
||||
struct intparse ip = {0};
|
||||
unsigned char tmp;
|
||||
|
||||
if (p) *p = (wchar_t *)s;
|
||||
|
||||
@ -20,7 +19,7 @@ uintmax_t wcstoumax(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;
|
||||
|
Reference in New Issue
Block a user