From 96cea94ad258be262ecf15b33d13cf775e59720d Mon Sep 17 00:00:00 2001
From: Rich Felker <dalias@aerifal.cx>
Date: Mon, 5 Sep 2011 22:23:06 -0400
Subject: fix incorrect overflow errors on strtoul, etc.

---
 src/stdlib/strtoull.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/stdlib/strtoull.c')

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;
 	}
-- 
cgit v1.2.1