fix a bug in overflow detection in integer parsing routine, add overflow tests (now that we always rep integers in 64bit entities regardless of arch word size)

1 files changed, 4 insertions, 1 deletions

diff --git a/src/yajl_parser.c b/src/yajl_parser.c
index 65d5ed6..69508b7 100644
--- a/src/yajl_parser.c
+++ b/src/yajl_parser.c
@@ -42,12 +42,15 @@ yajl_parse_integer(const unsigned char *number, unsigned int length)
     if (*pos == '+') { pos++; }
 
     while (pos < number + length) {
-
         if ( ret > MAX_VALUE_TO_MULTIPLY ) {
             errno = ERANGE;
             return sign == 1 ? LLONG_MAX : LLONG_MIN;
         }
         ret *= 10;
+        if (LLONG_MAX - ret < (*pos - '0')) {
+            errno = ERANGE;
+            return sign == 1 ? LLONG_MAX : LLONG_MIN;
+        }
         ret += (*pos++ - '0');
     }