Deal with overflow when decoding large numbers

17 years ago · 2d43af2707
1 changed files with 3 additions and 2 deletions
--- a/ext/json/JSON_parser.c
+++ b/ext/json/JSON_parser.c
@ -290,8 +290,9 @@ static void json_create_zval(zval **z, smart_str *buf, int type TSRMLS_DC)
    if (type == IS_LONG)
    {
 		long l = strtol(buf->c, NULL, 10);
-		if (l > LONG_MAX || l < LONG_MIN) {
-			ZVAL_DOUBLE(*z, zend_strtod(buf->c, NULL));
+		double d = zend_strtod(buf->c, NULL);
+		if (d > LONG_MAX || d < LONG_MIN) {
+			ZVAL_DOUBLE(*z, d);
 		} else {
 			ZVAL_LONG(*z, l);
 		}