summaryrefslogtreecommitdiff
path: root/src/stdlib/strtoull.c
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-09-05 22:23:06 -0400
committerRich Felker <dalias@aerifal.cx>2011-09-05 22:23:06 -0400
commit96cea94ad258be262ecf15b33d13cf775e59720d (patch)
tree533a76158ab9473da5d0017d73e28105680f663e /src/stdlib/strtoull.c
parent5989dde3459b2ccd304f89e3e875136e5608b8ff (diff)
downloadmusl-96cea94ad258be262ecf15b33d13cf775e59720d.tar.gz
fix incorrect overflow errors on strtoul, etc.
Diffstat (limited to 'src/stdlib/strtoull.c')
-rw-r--r--src/stdlib/strtoull.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/stdlib/strtoull.c b/src/stdlib/strtoull.c
index 20aa7bde..5d1c4ee5 100644
--- 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;
}