fluencelabs/musl
1
0
Fork 0
mirror of https://github.com/fluencelabs/musl synced 2025-05-28 15:11:34 +00:00
Code Issues Projects Releases Wiki Activity

fix incorrect overflow errors on strtoul, etc.

Browse Source
This commit is contained in:
Rich Felker 2011-09-05 22:23:06 -04:00
parent 5989dde345
commit 96cea94ad2
4 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/stdlib/strtoul.c
View File

@ -5,8 +5,11 @@
unsigned long strtoul(const char *s, char **p, int base) unsigned long strtoul(const char *s, char **p, int base)
{ {
uintmax_t x = strtoumax(s, p, base); intmax_t x;
if (x > ULONG_MAX) { if (sizeof(intmax_t) == sizeof(long))
return strtoumax(s, p, base);
x = strtoimax(s, p, base);
if (-x > ULONG_MAX || x > ULONG_MAX) {
errno = ERANGE; errno = ERANGE;
return ULONG_MAX; return ULONG_MAX;
} }

7
src/stdlib/strtoull.c
View File

@ -5,8 +5,11 @@
unsigned long long strtoull(const char *s, char **p, int base) unsigned long long strtoull(const char *s, char **p, int base)
{ {
uintmax_t x = strtoumax(s, p, base); intmax_t x;
if (x > ULLONG_MAX) { if (sizeof(intmax_t) == sizeof(long long))
return strtoumax(s, p, base);
x = strtoimax(s, p, base);
if (-x > ULLONG_MAX || x > ULLONG_MAX) {
errno = ERANGE; errno = ERANGE;
return ULLONG_MAX; return ULLONG_MAX;
} }

7
src/stdlib/wcstoul.c
View File

@ -6,8 +6,11 @@
unsigned long wcstoul(const wchar_t *s, wchar_t **p, int base) unsigned long wcstoul(const wchar_t *s, wchar_t **p, int base)
{ {
uintmax_t x = wcstoumax(s, p, base); intmax_t x;
if (x > ULONG_MAX) { if (sizeof(intmax_t) == sizeof(long))
return wcstoumax(s, p, base);
x = wcstoimax(s, p, base);
if (-x > ULONG_MAX || x > ULONG_MAX) {
errno = ERANGE; errno = ERANGE;
return ULONG_MAX; return ULONG_MAX;
} }

7
src/stdlib/wcstoull.c
View File

@ -6,8 +6,11 @@
unsigned long long wcstoull(const wchar_t *s, wchar_t **p, int base) unsigned long long wcstoull(const wchar_t *s, wchar_t **p, int base)
{ {
uintmax_t x = wcstoumax(s, p, base); intmax_t x;
if (x > ULLONG_MAX) { if (sizeof(intmax_t) == sizeof(long long))
return wcstoumax(s, p, base);
x = wcstoimax(s, p, base);
if (-x > ULLONG_MAX || x > ULLONG_MAX) {
errno = ERANGE; errno = ERANGE;
return ULLONG_MAX; return ULLONG_MAX;
} }