cvs: php-src(PHP_5_2) /ext/json JSON_parser.c
| From: | Matt Wilmas | Date: | Thu, 19 Mar 2009 19:27:14 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/json JSON_parser.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-56642@lists.php.net to get a copy of this message | ||
mattwil Thu Mar 19 19:27:14 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/json JSON_parser.c
Log:
MFH: Handle overflow when decoding large numbers and avoid 2 conversions
http://cvs.php.net/viewvc.cgi/php-src/ext/json/JSON_parser.c?r1=1.1.2.16&r2=1.1.2.17&diff_format=u
Index: php-src/ext/json/JSON_parser.c
diff -u php-src/ext/json/JSON_parser.c:1.1.2.16 php-src/ext/json/JSON_parser.c:1.1.2.17
--- php-src/ext/json/JSON_parser.c:1.1.2.16 Tue Mar 17 02:02:45 2009
+++ php-src/ext/json/JSON_parser.c Thu Mar 19 19:27:14 2009
@@ -284,15 +284,27 @@
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));
- } else {
- ZVAL_LONG(*z, l);
+ if (buf->c[0] == '-') {
+ buf->len--;
}
+
+ if (buf->len >= MAX_LENGTH_OF_LONG - 1) {
+ if (buf->len == MAX_LENGTH_OF_LONG - 1) {
+ int cmp = strcmp(buf->c + (buf->c[0] == '-'), long_min_digits);
+
+ if (!(cmp < 0 || (cmp == 0 && buf->c[0] == '-'))) {
+ goto use_double;
+ }
+ } else {
+ goto use_double;
+ }
+ }
+
+ ZVAL_LONG(*z, strtol(buf->c, NULL, 10));
}
else if (type == IS_DOUBLE)
{
+use_double:
ZVAL_DOUBLE(*z, zend_strtod(buf->c, NULL));
}
else if (type == IS_STRING)