tony2001 Wed May 16 12:54:31 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/json/tests bug41403.phpt
Modified files:
/php-src NEWS
/php-src/ext/json JSON_parser.c
Log:
MFH: fix #41403 (json_decode cannot decode floats if localeconv decimal_point
is not '.')
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.706&r2=1.2027.2.547.2.707&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.706 php-src/NEWS:1.2027.2.547.2.707
--- php-src/NEWS:1.2027.2.547.2.706 Tue May 15 13:04:43 2007
+++ php-src/NEWS Wed May 16 12:54:30 2007
@@ -10,6 +10,8 @@
- Fixed altering $this via argument named "this". (Dmitry)
- Fixed PHP CLI to use the php.ini from the binary location. (Hannes)
- Fixed segfault in strripos(). (Tony, Joxean Koret)
+- Fixed bug #41403 (json_decode cannot decode floats if localeconv
+ decimal_point is not '.'). (Tony)
- Fixed bug #41390 (Clarify error message with invalid protocol scheme).
(Scott)
- Fixed bug #41378 (fastcgi protocol lacks support for Reason-Phrase in
http://cvs.php.net/viewvc.cgi/php-src/ext/json/JSON_parser.c?r1=1.1.2.6&r2=1.1.2.7&diff_format=u
Index: php-src/ext/json/JSON_parser.c
diff -u php-src/ext/json/JSON_parser.c:1.1.2.6
php-src/ext/json/JSON_parser.c:1.1.2.7
--- php-src/ext/json/JSON_parser.c:1.1.2.6 Mon Apr 16 22:31:05 2007
+++ php-src/ext/json/JSON_parser.c Wed May 16 12:54:30 2007
@@ -288,7 +288,7 @@
}
else if (type == IS_DOUBLE)
{
- ZVAL_DOUBLE(*z, atof(buf->c));
+ ZVAL_DOUBLE(*z, zend_strtod(buf->c, NULL));
}
else if (type == IS_STRING)
{
http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/bug41403.phpt?view=markup&rev=1.1
Index: php-src/ext/json/tests/bug41403.phpt
+++ php-src/ext/json/tests/bug41403.phpt
--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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
