fix incorrect overflow errors on strtoul, etc.

diff --git a/src/stdlib/strtoul.c b/src/stdlib/strtoul.c
index 951d5e8..20d8bfb 100644 (file)
--- a/src/stdlib/strtoul.c
+++ b/src/stdlib/strtoul.c
@@ -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;
        }

diff --git a/src/stdlib/strtoull.c b/src/stdlib/strtoull.c
index 20aa7bd..5d1c4ee 100644 (file)
--- a/src/stdlib/strtoull.c
+++ b/src/stdlib/strtoull.c
@@ -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;
        }

diff --git a/src/stdlib/wcstoul.c b/src/stdlib/wcstoul.c
index e39faaf..9cbec1a 100644 (file)
--- a/src/stdlib/wcstoul.c
+++ b/src/stdlib/wcstoul.c
@@ -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;
        }

diff --git a/src/stdlib/wcstoull.c b/src/stdlib/wcstoull.c
index e324dfb..48c557d 100644 (file)
--- a/src/stdlib/wcstoull.c
+++ b/src/stdlib/wcstoull.c
@@ -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;
        }