archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Alter php_json_decode_ex() to respect JSON_BIGINT_AS_STRING for bare numbers.

Browse source 
Fixes bug #63737 (json_decode does not properly decode with options parameter).
This commit is contained in:
Adam Harvey 2012-12-11 19:51:30 +08:00
parent 95fd52ff3d
commit 2d1694d4eb
3 changed files with 64 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

31
ext/json/json.c
View file

@ -682,7 +682,7 @@ PHP_JSON_API void php_json_decode_ex(zval *return_value, char *str, int str_len,
else
{
double d;
int type;
int type, overflow_info;
long p;
RETVAL_NULL();
@ -698,11 +698,36 @@ PHP_JSON_API void php_json_decode_ex(zval *return_value, char *str, int str_len,
RETVAL_BOOL(0);
}
if ((type = is_numeric_string(str, str_len, &p, &d, 0)) != 0) {
if ((type = is_numeric_string_ex(str, str_len, &p, &d, 0, &overflow_info)) != 0) {
if (type == IS_LONG) {
RETVAL_LONG(p);
} else if (type == IS_DOUBLE) {
RETVAL_DOUBLE(d);
if (options & PHP_JSON_BIGINT_AS_STRING && overflow_info) {
/* Within an object or array, a numeric literal is assumed
* to be an integer if and only if it's entirely made up of
* digits (exponent notation will result in the number
* being treated as a double). We'll match that behaviour
* here. */
int i;
zend_bool is_float = 0;
for (i = (str[0] == '-' ? 1 : 0); i < str_len; i++) {
/* Not using isdigit() because it's locale specific,
* but we expect JSON input to always be UTF-8. */
if (str[i] < '0' || str[i] > '9') {
is_float = 1;
break;
}
}
if (is_float) {
RETVAL_DOUBLE(d);
} else {
RETVAL_STRINGL(str, str_len, 1);
}
} else {
RETVAL_DOUBLE(d);
}
}
}