iliaa Sun Jan 30 11:39:55 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard var_unserializer.c var_unserializer.re
Log:
MFH: Fix handling of INF/NAN in unserialize().
http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.c?r1=1.18.4.19&r2=1.18.4.20&ty=u
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.18.4.19
php-src/ext/standard/var_unserializer.c:1.18.4.20
--- php-src/ext/standard/var_unserializer.c:1.18.4.19 Wed Jan 26 11:56:14 2005
+++ php-src/ext/standard/var_unserializer.c Sun Jan 30 11:39:55 2005
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.3 on Wed Jan 26 11:07:03 2005 */
+/* Generated by re2c 0.9.3 on Sun Jan 30 11:35:55 2005 */
#line 1 "/home/rei/php_dev/php4/ext/standard/var_unserializer.re"
/*
+----------------------------------------------------------------------+
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var_unserializer.c,v 1.18.4.19 2005/01/26 16:56:14 iliaa Exp $ */
+/* $Id: var_unserializer.c,v 1.18.4.20 2005/01/30 16:39:55 iliaa Exp $ */
#include "php.h"
#include "ext/standard/php_var.h"
@@ -432,7 +432,7 @@
if(yych == ':') goto yy87;
goto yy4;
yy4:
-#line 576 "/home/rei/php_dev/php4/ext/standard/var_unserializer.re"
+#line 574 "/home/rei/php_dev/php4/ext/standard/var_unserializer.re"
{ return 0; }
#line 102 "<stdout>"
yy5: yyaccept = 0;
@@ -473,7 +473,7 @@
yy14: ++YYCURSOR;
goto yy15;
yy15:
-#line 570 "/home/rei/php_dev/php4/ext/standard/var_unserializer.re"
+#line 568 "/home/rei/php_dev/php4/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");
@@ -502,7 +502,7 @@
yy22: ++YYCURSOR;
goto yy23;
yy23:
-#line 489 "/home/rei/php_dev/php4/ext/standard/var_unserializer.re"
+#line 487 "/home/rei/php_dev/php4/ext/standard/var_unserializer.re"
{
size_t len, len2, maxlen;
int elements;
@@ -612,7 +612,7 @@
yy29: ++YYCURSOR;
goto yy30;
yy30:
-#line 481 "/home/rei/php_dev/php4/ext/standard/var_unserializer.re"
+#line 479 "/home/rei/php_dev/php4/ext/standard/var_unserializer.re"
{
INIT_PZVAL(*rval);
@@ -644,7 +644,7 @@
yy36: ++YYCURSOR;
goto yy37;
yy37:
-#line 463 "/home/rei/php_dev/php4/ext/standard/var_unserializer.re"
+#line 461 "/home/rei/php_dev/php4/ext/standard/var_unserializer.re"
{
int elements = parse_iv(start + 2);
@@ -686,7 +686,7 @@
yy43: ++YYCURSOR;
goto yy44;
yy44:
-#line 435 "/home/rei/php_dev/php4/ext/standard/var_unserializer.re"
+#line 433 "/home/rei/php_dev/php4/ext/standard/var_unserializer.re"
{
size_t len, maxlen;
char *str;
@@ -803,7 +803,7 @@
yy55: ++YYCURSOR;
goto yy56;
yy56:
-#line 428 "/home/rei/php_dev/php4/ext/standard/var_unserializer.re"
+#line 426 "/home/rei/php_dev/php4/ext/standard/var_unserializer.re"
{
*p = YYCURSOR;
INIT_PZVAL(*rval);
@@ -874,9 +874,7 @@
{
*p = YYCURSOR;
INIT_PZVAL(*rval);
-#if defined(HAVE_ATOF_ACCEPTS_NAN) && defined(HAVE_ATOF_ACCEPTS_INF)
- ZVAL_DOUBLE(*rval, zend_strtod(start + 2, NULL));
-#else
+
if (!strncmp(start + 2, "NAN", 3)) {
ZVAL_DOUBLE(*rval, php_get_nan());
} else if (!strncmp(start + 2, "INF", 3)) {
@@ -884,10 +882,10 @@
} else if (!strncmp(start + 2, "-INF", 4)) {
ZVAL_DOUBLE(*rval, -php_get_inf());
}
-#endif
+
return 1;
}
-#line 563 "<stdout>"
+#line 561 "<stdout>"
yy68: yych = *++YYCURSOR;
if(yych == 'N') goto yy65;
goto yy2;
@@ -923,7 +921,7 @@
ZVAL_LONG(*rval, parse_iv(start + 2));
return 1;
}
-#line 600 "<stdout>"
+#line 598 "<stdout>"
yy75: yych = *++YYCURSOR;
if(yych <= '/') goto yy2;
if(yych >= '2') goto yy2;
@@ -941,7 +939,7 @@
ZVAL_BOOL(*rval, parse_iv(start + 2));
return 1;
}
-#line 618 "<stdout>"
+#line 616 "<stdout>"
yy79: ++YYCURSOR;
goto yy80;
yy80:
@@ -952,7 +950,7 @@
ZVAL_NULL(*rval);
return 1;
}
-#line 629 "<stdout>"
+#line 627 "<stdout>"
yy81: yych = *++YYCURSOR;
if(yych <= ','){
if(yych != '+') goto yy2;
@@ -1001,7 +999,7 @@
return 1;
}
-#line 679 "<stdout>"
+#line 677 "<stdout>"
yy87: yych = *++YYCURSOR;
if(yych <= ','){
if(yych != '+') goto yy2;
@@ -1048,9 +1046,9 @@
return 1;
}
-#line 727 "<stdout>"
+#line 725 "<stdout>"
}
-#line 578 "/home/rei/php_dev/php4/ext/standard/var_unserializer.re"
+#line 576 "/home/rei/php_dev/php4/ext/standard/var_unserializer.re"
return 0;
http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.re?r1=1.11.4.12&r2=1.11.4.13&ty=u
Index: php-src/ext/standard/var_unserializer.re
diff -u php-src/ext/standard/var_unserializer.re:1.11.4.12
php-src/ext/standard/var_unserializer.re:1.11.4.13
--- php-src/ext/standard/var_unserializer.re:1.11.4.12 Wed Jan 26 11:56:14 2005
+++ php-src/ext/standard/var_unserializer.re Sun Jan 30 11:39:55 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var_unserializer.re,v 1.11.4.12 2005/01/26 16:56:14 iliaa Exp $ */
+/* $Id: var_unserializer.re,v 1.11.4.13 2005/01/30 16:39:55 iliaa Exp $ */
#include "php.h"
#include "ext/standard/php_var.h"
@@ -411,9 +411,7 @@
"d:" ("NAN" | "-"? "INF") ";" {
*p = YYCURSOR;
INIT_PZVAL(*rval);
-#if defined(HAVE_ATOF_ACCEPTS_NAN) && defined(HAVE_ATOF_ACCEPTS_INF)
- ZVAL_DOUBLE(*rval, zend_strtod(start + 2, NULL));
-#else
+
if (!strncmp(start + 2, "NAN", 3)) {
ZVAL_DOUBLE(*rval, php_get_nan());
} else if (!strncmp(start + 2, "INF", 3)) {
@@ -421,7 +419,7 @@
} else if (!strncmp(start + 2, "-INF", 4)) {
ZVAL_DOUBLE(*rval, -php_get_inf());
}
-#endif
+
return 1;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
