clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-25 20:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid 2 conversions when decoding numbers

Browse Source
This commit is contained in:
Matt Wilmas 2009-03-19 19:25:42 +00:00
parent b7c73cf1dd
commit efd9d3482d
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ext/json/JSON_parser.c
View File

@ -289,16 +289,27 @@ 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);
double d = zend_strtod(buf->c, NULL);
if (d > LONG_MAX || d < LONG_MIN) {
ZVAL_DOUBLE(*z, d);
} 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)