scottmac Tue Mar 17 02:02:45 2009 UTC Added files: (Branch: PHP_5_2) /php-src/ext/json/tests bug47644.phpt
Modified files: /php-src/ext/json JSON_parser.c Log: MFH Fix bug #47644 - Valid integers are truncated with json_decode() http://cvs.php.net/viewvc.cgi/php-src/ext/json/JSON_parser.c?r1=1.1.2.15&r2=1.1.2.16&diff_format=u Index: php-src/ext/json/JSON_parser.c diff -u php-src/ext/json/JSON_parser.c:1.1.2.15 php-src/ext/json/JSON_parser.c:1.1.2.16 --- php-src/ext/json/JSON_parser.c:1.1.2.15 Fri Dec 19 02:13:41 2008 +++ php-src/ext/json/JSON_parser.c Tue Mar 17 02:02:45 2009 @@ -284,12 +284,12 @@ if (type == IS_LONG) { - double d = zend_strtod(buf->c, NULL); - if (d > LONG_MAX || d < LONG_MIN) { - ZVAL_DOUBLE(*z, d); - } else { - ZVAL_LONG(*z, (long)d); - } + long l = strtol(buf->c, NULL, 10); + if (l > LONG_MAX || l < LONG_MIN) { + ZVAL_DOUBLE(*z, zend_strtod(buf->c, NULL)); + } else { + ZVAL_LONG(*z, l); + } } else if (type == IS_DOUBLE) { http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/bug47644.phpt?view=markup&rev=1.1 Index: php-src/ext/json/tests/bug47644.phpt +++ php-src/ext/json/tests/bug47644.phpt --TEST-- Bug #47644 (valid large integers are truncated) --SKIPIF-- <?php if (!extension_loaded('json')) die('skip: json extension not available'); if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php for ($i = 10000000000000000; $i < 10000000000000006; $i++) { var_dump(json_decode("[$i]")); } echo "Done\n"; ?> --EXPECT-- array(1) { [0]=> int(10000000000000000) } array(1) { [0]=> int(10000000000000001) } array(1) { [0]=> int(10000000000000002) } array(1) { [0]=> int(10000000000000003) } array(1) { [0]=> int(10000000000000004) } array(1) { [0]=> int(10000000000000005) } Done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php