提交 96cea94a 编写于 作者: R Rich Felker

fix incorrect overflow errors on strtoul, etc.

上级 5989dde3
......@@ -5,8 +5,11 @@
unsigned long strtoul(const char *s, char **p, int base)
{
uintmax_t x = strtoumax(s, p, base);
if (x > ULONG_MAX) {
intmax_t x;
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;
return ULONG_MAX;
}
......
......@@ -5,8 +5,11 @@
unsigned long long strtoull(const char *s, char **p, int base)
{
uintmax_t x = strtoumax(s, p, base);
if (x > ULLONG_MAX) {
intmax_t x;
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;
return ULLONG_MAX;
}
......
......@@ -6,8 +6,11 @@
unsigned long wcstoul(const wchar_t *s, wchar_t **p, int base)
{
uintmax_t x = wcstoumax(s, p, base);
if (x > ULONG_MAX) {
intmax_t x;
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;
return ULONG_MAX;
}
......
......@@ -6,8 +6,11 @@
unsigned long long wcstoull(const wchar_t *s, wchar_t **p, int base)
{
uintmax_t x = wcstoumax(s, p, base);
if (x > ULLONG_MAX) {
intmax_t x;
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;
return ULLONG_MAX;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册