1 files changed, 14 insertions, 3 deletions
diff --git a/mdk-stage1/dietlibc/lib/strtol.c b/mdk-stage1/dietlibc/lib/strtol.c
index ead89f408..2624aca0e 100644
--- a/mdk-stage1/dietlibc/lib/strtol.c
+++ b/mdk-stage1/dietlibc/lib/strtol.c
@@ -1,7 +1,10 @@
 #include <ctype.h>
+#include "dietfeatures.h"
+#include <errno.h>
+#include <limits.h>
+#include <stdlib.h>
 
-extern unsigned long int strtoul(const char *nptr, char **endptr, int base);
-
+#define ABS_LONG_MIN 2147483648UL
 long int strtol(const char *nptr, char **endptr, int base)
 {
   int neg=0;
@@ -9,7 +12,15 @@ long int strtol(const char *nptr, char **endptr, int base)
 
   while(isspace(*nptr)) nptr++;
 
-  if (*nptr == '-' && isdigit(nptr[1])) { neg=-1; nptr++; }
+  if (*nptr == '-') { neg=-1; ++nptr; }
   v=strtoul(nptr,endptr,base);
+  if (v>=ABS_LONG_MIN) {
+    if (v==ABS_LONG_MIN && neg) {
+      errno=0;
+      return v;
+    }
+    errno=ERANGE;
+    return (neg?LONG_MIN:LONG_MAX);
+  }
   return (neg?-v:v);
 }