From: Ilia Alshanetsky Date: Wed, 26 Jan 2005 16:55:49 +0000 (+0000) Subject: MFH: Fixed bug #31699 (unserialize() float problem on non-English locales). X-Git-Tag: php-5.0.4RC1~242 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=906b0b423555b002caed07be032396826122f291;p=php MFH: Fixed bug #31699 (unserialize() float problem on non-English locales). --- diff --git a/NEWS b/NEWS index 4f0993792f..1e7e452e07 100644 --- a/NEWS +++ b/NEWS @@ -11,6 +11,7 @@ PHP NEWS - Fixed a bug in mysqli_stmt_execute() (type conversion with NULL values). (Georg) - Fixed bug #31684 (dio_tcsetattr(): misconfigured termios settings). (elod at itfais dot com) +- Fixed bug #31699 (unserialize() float problem on non-English locales). (Ilia) - Fixed bug #31651 (ReflectionClass::getDefaultProperties segfaults with arrays). (Marcus) - Fixed bug #31623 (OCILogin does not support password grace period). diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c index 355469e27c..e0d1fe8ddf 100644 --- a/ext/standard/var_unserializer.c +++ b/ext/standard/var_unserializer.c @@ -1,5 +1,5 @@ -/* Generated by re2c 0.9.4 on Sat Sep 25 00:07:00 2004 */ -#line 1 "/usr/src/PHP_5_0/ext/standard/var_unserializer.re" +/* Generated by re2c 0.9.3 on Wed Jan 26 11:12:49 2005 */ +#line 1 "/home/rei/php_dev/php5/ext/standard/var_unserializer.re" /* +----------------------------------------------------------------------+ | PHP Version 5 | @@ -147,7 +147,7 @@ PHPAPI void var_destroy(php_unserialize_data_t *var_hashx) #define YYMARKER marker -#line 118 "/usr/src/PHP_5_0/ext/standard/var_unserializer.re" +#line 154 "/home/rei/php_dev/php5/ext/standard/var_unserializer.re" @@ -406,7 +406,7 @@ yy0: goto yy16; } else { if(yych <= '}') goto yy14; - if(yych <= 0xBF) goto yy16; + if(yych <= '\277') goto yy16; goto yy2; } } @@ -420,7 +420,7 @@ yy3: yyaccept = 0; if(yych == ':') goto yy87; goto yy4; yy4: -#line 532 "/usr/src/PHP_5_0/ext/standard/var_unserializer.re" +#line 576 "/home/rei/php_dev/php5/ext/standard/var_unserializer.re" { return 0; } #line 102 "" yy5: yyaccept = 0; @@ -461,7 +461,7 @@ yy13: yyaccept = 0; yy14: ++YYCURSOR; goto yy15; yy15: -#line 526 "/usr/src/PHP_5_0/ext/standard/var_unserializer.re" +#line 570 "/home/rei/php_dev/php5/ext/standard/var_unserializer.re" { /* this is the case where we have less data than planned */ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Unexpected end of serialized data"); @@ -490,7 +490,7 @@ yy21: yych = *++YYCURSOR; yy22: ++YYCURSOR; goto yy23; yy23: -#line 433 "/usr/src/PHP_5_0/ext/standard/var_unserializer.re" +#line 477 "/home/rei/php_dev/php5/ext/standard/var_unserializer.re" { size_t len, len2, maxlen; int elements; @@ -612,7 +612,7 @@ yy28: yych = *++YYCURSOR; yy29: ++YYCURSOR; goto yy30; yy30: -#line 425 "/usr/src/PHP_5_0/ext/standard/var_unserializer.re" +#line 469 "/home/rei/php_dev/php5/ext/standard/var_unserializer.re" { INIT_PZVAL(*rval); @@ -644,7 +644,7 @@ yy35: yych = *++YYCURSOR; yy36: ++YYCURSOR; goto yy37; yy37: -#line 407 "/usr/src/PHP_5_0/ext/standard/var_unserializer.re" +#line 451 "/home/rei/php_dev/php5/ext/standard/var_unserializer.re" { int elements = parse_iv(start + 2); @@ -686,7 +686,7 @@ yy42: yych = *++YYCURSOR; yy43: ++YYCURSOR; goto yy44; yy44: -#line 379 "/usr/src/PHP_5_0/ext/standard/var_unserializer.re" +#line 423 "/home/rei/php_dev/php5/ext/standard/var_unserializer.re" { size_t len, maxlen; char *str; @@ -803,11 +803,11 @@ yy54: if(yych <= ';'){ yy55: ++YYCURSOR; goto yy56; yy56: -#line 372 "/usr/src/PHP_5_0/ext/standard/var_unserializer.re" +#line 416 "/home/rei/php_dev/php5/ext/standard/var_unserializer.re" { *p = YYCURSOR; INIT_PZVAL(*rval); - ZVAL_DOUBLE(*rval, atof(start + 2)); + ZVAL_DOUBLE(*rval, zend_strtod(start + 2, NULL)); return 1; } #line 496 "" @@ -870,12 +870,12 @@ yy65: yych = *++YYCURSOR; yy66: ++YYCURSOR; goto yy67; yy67: -#line 355 "/usr/src/PHP_5_0/ext/standard/var_unserializer.re" +#line 399 "/home/rei/php_dev/php5/ext/standard/var_unserializer.re" { *p = YYCURSOR; INIT_PZVAL(*rval); #if defined(HAVE_ATOF_ACCEPTS_NAN) && defined(HAVE_ATOF_ACCEPTS_INF) - ZVAL_DOUBLE(*rval, atof(start + 2)); + ZVAL_DOUBLE(*rval, zend_strtod(start + 2, NULL)); #else if (!strncmp(start + 2, "NAN", 3)) { ZVAL_DOUBLE(*rval, php_get_nan()); @@ -916,7 +916,7 @@ yy72: if(yych <= '/') goto yy2; yy73: ++YYCURSOR; goto yy74; yy74: -#line 348 "/usr/src/PHP_5_0/ext/standard/var_unserializer.re" +#line 392 "/home/rei/php_dev/php5/ext/standard/var_unserializer.re" { *p = YYCURSOR; INIT_PZVAL(*rval); @@ -934,7 +934,7 @@ yy76: yych = *++YYCURSOR; yy77: ++YYCURSOR; goto yy78; yy78: -#line 341 "/usr/src/PHP_5_0/ext/standard/var_unserializer.re" +#line 385 "/home/rei/php_dev/php5/ext/standard/var_unserializer.re" { *p = YYCURSOR; INIT_PZVAL(*rval); @@ -945,7 +945,7 @@ yy78: yy79: ++YYCURSOR; goto yy80; yy80: -#line 334 "/usr/src/PHP_5_0/ext/standard/var_unserializer.re" +#line 378 "/home/rei/php_dev/php5/ext/standard/var_unserializer.re" { *p = YYCURSOR; INIT_PZVAL(*rval); @@ -978,7 +978,7 @@ yy84: if(yych <= '/') goto yy2; yy85: ++YYCURSOR; goto yy86; yy86: -#line 313 "/usr/src/PHP_5_0/ext/standard/var_unserializer.re" +#line 355 "/home/rei/php_dev/php5/ext/standard/var_unserializer.re" { int id; @@ -1001,7 +1001,7 @@ yy86: return 1; } -#line 689 "" +#line 691 "" yy87: yych = *++YYCURSOR; if(yych <= ','){ if(yych != '+') goto yy2; @@ -1027,7 +1027,7 @@ yy90: if(yych <= '/') goto yy2; yy91: ++YYCURSOR; goto yy92; yy92: -#line 292 "/usr/src/PHP_5_0/ext/standard/var_unserializer.re" +#line 334 "/home/rei/php_dev/php5/ext/standard/var_unserializer.re" { int id; @@ -1048,9 +1048,9 @@ yy92: return 1; } -#line 737 "" +#line 739 "" } -#line 534 "/usr/src/PHP_5_0/ext/standard/var_unserializer.re" +#line 578 "/home/rei/php_dev/php5/ext/standard/var_unserializer.re" return 0; diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re index 9dd77165dd..ae577ce836 100644 --- a/ext/standard/var_unserializer.re +++ b/ext/standard/var_unserializer.re @@ -400,7 +400,7 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER) *p = YYCURSOR; INIT_PZVAL(*rval); #if defined(HAVE_ATOF_ACCEPTS_NAN) && defined(HAVE_ATOF_ACCEPTS_INF) - ZVAL_DOUBLE(*rval, atof(start + 2)); + ZVAL_DOUBLE(*rval, zend_strtod(start + 2, NULL)); #else if (!strncmp(start + 2, "NAN", 3)) { ZVAL_DOUBLE(*rval, php_get_nan()); @@ -416,7 +416,7 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER) "d:" (iv | nv | nvexp) ";" { *p = YYCURSOR; INIT_PZVAL(*rval); - ZVAL_DOUBLE(*rval, atof(start + 2)); + ZVAL_DOUBLE(*rval, zend_strtod(start + 2, NULL)); return 1; }