cvs: php-src(PHP_5_3) /ext/json JSON_parser.c
| From: | Scott MacVicar | Date: | Tue, 17 Mar 2009 14:57:39 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /ext/json JSON_parser.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-56572@lists.php.net to get a copy of this message | ||
scottmac Tue Mar 17 14:57:39 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/json JSON_parser.c
Log:
MFH Deal with overflow when decoding large numbers
http://cvs.php.net/viewvc.cgi/php-src/ext/json/JSON_parser.c?r1=1.1.2.12.2.7&r2=1.1.2.12.2.8&diff_format=u
Index: php-src/ext/json/JSON_parser.c
diff -u php-src/ext/json/JSON_parser.c:1.1.2.12.2.7 php-src/ext/json/JSON_parser.c:1.1.2.12.2.8
--- php-src/ext/json/JSON_parser.c:1.1.2.12.2.7 Tue Mar 17 02:00:13 2009
+++ php-src/ext/json/JSON_parser.c Tue Mar 17 14:57:39 2009
@@ -290,8 +290,9 @@
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);
}