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

fix #41403 (json_decode cannot decode floats if localeconv decimal_point is not '.')

Browse Source
This commit is contained in:
Antony Dovgal 2007-05-16 12:53:36 +00:00
parent a4bc40e970
commit b21fe28568
2 changed files with 63 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/json/JSON_parser.c
View File

@ -288,7 +288,7 @@ static void json_create_zval(zval **z, smart_str *buf, int type TSRMLS_DC)
}
else if (type == IS_DOUBLE)
{
ZVAL_DOUBLE(*z, atof(buf->c));
ZVAL_DOUBLE(*z, zend_strtod(buf->c, NULL));
}
else if (type == IS_STRING)
{

62
ext/json/tests/bug41403.phpt Normal file
View File

@ -0,0 +1,62 @@
--TEST--
Bug #41403 (json_decode cannot decode floats if localeconv decimal_point is not '.')
--SKIPIF--
<?php
if (setlocale(LC_NUMERIC, "de_DE") === false) {
die("skip no de_DE locale");
}
?>
--INI--
precision=14
--FILE--
<?php
setlocale(LC_NUMERIC, 'de_DE');
var_dump(json_decode('[2.1]'));
var_dump(json_decode('[0.15]'));
var_dump(json_decode('[123.13452345]'));
var_dump(json_decode('[123,13452345]'));
echo "Done\n";
?>
--EXPECTF--
array(1) {
[0]=>
float(2,1)
}
array(1) {
[0]=>
float(0,15)
}
array(1) {
[0]=>
float(123,13452345)
}
array(2) {
[0]=>
int(123)
[1]=>
int(13452345)
}
Done
--UEXPECTF--
Strict Standards: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d
array(1) {
[0]=>
float(2,1)
}
array(1) {
[0]=>
float(0,15)
}
array(1) {
[0]=>
float(123,13452345)
}
array(2) {
[0]=>
int(123)
[1]=>
int(13452345)
}
Done