X-Git-Url: http://www.project-moonshot.org/gitweb/?p=jansson.git;a=blobdiff_plain;f=src%2Fload.c;h=2a360ffa04ff308baa670f03e0341851d9e2eb77;hp=f86d2b5a79ab21420e2d4cc51601a07132b092a5;hb=ffbab6fedd86ee1a0c7884d62fa7233ce9d745d2;hpb=7ce70533c90dc7dfc3570023144547dfb32950e1

diff --git a/src/load.c b/src/load.c
index f86d2b5..2a360ff 100644
--- a/src/load.c
+++ b/src/load.c
@@ -52,7 +52,7 @@ typedef struct {
     int line, column;
     union {
         char *string;
-        long integer;
+        json_int_t integer;
         double real;
     } value;
 } lex_t;
@@ -401,6 +401,12 @@ out:
     free(lex->value.string);
 }
 
+#ifdef JSON_INTEGER_IS_LONG_LONG
+#define json_strtoint     strtoll
+#else
+#define json_strtoint     strtol
+#endif
+
 static int lex_scan_number(lex_t *lex, char c, json_error_t *error)
 {
     const char *saved_text;
@@ -430,23 +436,24 @@ static int lex_scan_number(lex_t *lex, char c, json_error_t *error)
     }
 
     if(c != '.' && c != 'E' && c != 'e') {
-        long value;
+        json_int_t value;
 
         lex_unget_unsave(lex, c);
 
         saved_text = strbuffer_value(&lex->saved_text);
-        value = strtol(saved_text, &end, 10);
-        assert(end == saved_text + lex->saved_text.length);
 
-        if(value == LONG_MAX && errno == ERANGE) {
-            error_set(error, lex, "too big integer");
-            goto out;
-        }
-        else if(value == LONG_MIN && errno == ERANGE) {
-            error_set(error, lex, "too big negative integer");
+        errno = 0;
+        value = json_strtoint(saved_text, &end, 10);
+        if(errno == ERANGE) {
+            if(value < 0)
+                error_set(error, lex, "too big negative integer");
+            else
+                error_set(error, lex, "too big integer");
             goto out;
         }
 
+        assert(end == saved_text + lex->saved_text.length);
+
         lex->token = TOKEN_INTEGER;
         lex->value.integer = value;
         return 0;