mattwil Tue Mar 17 22:02:05 2009 UTC
Added files:
/php-src/ext/standard/tests/serialize bug46882.phpt
Modified files:
/php-src/ext/standard var_unserializer.c var_unserializer.re
Log:
Fixed bug #46882 (Serialize / Unserialize misbehaviour under OS with
different bit numbers)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.c?r1=1.97&r2=1.98&diff_format=u
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.97
php-src/ext/standard/var_unserializer.c:1.98
--- php-src/ext/standard/var_unserializer.c:1.97 Tue Mar 10 23:39:41 2009
+++ php-src/ext/standard/var_unserializer.c Tue Mar 17 22:02:05 2009
@@ -1,8 +1,8 @@
-/* Generated by re2c 0.13.5 on Fri Aug 29 18:45:19 2008 */
+/* Generated by re2c 0.13.5 on Tue Mar 17 16:18:00 2009 */
#line 1 "ext/standard/var_unserializer.re"
/*
+----------------------------------------------------------------------+
- | PHP Version 6 |
+ | PHP Version 5 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2006 The PHP Group |
+----------------------------------------------------------------------+
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var_unserializer.c,v 1.97 2009/03/10 23:39:41 helly Exp $ */
+/* $Id: var_unserializer.c,v 1.98 2009/03/17 22:02:05 mattwil Exp $ */
#include "php.h"
#include "ext/standard/php_var.h"
@@ -522,7 +522,7 @@
yych = *(YYMARKER = ++YYCURSOR);
if (yych == ':') goto yy103;
yy3:
-#line 794 "ext/standard/var_unserializer.re"
+#line 817 "ext/standard/var_unserializer.re"
{ return 0; }
#line 528 "ext/standard/var_unserializer.c"
yy4:
@@ -571,7 +571,7 @@
goto yy3;
yy15:
++YYCURSOR;
-#line 788 "ext/standard/var_unserializer.re"
+#line 811 "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");
@@ -607,7 +607,7 @@
yych = *++YYCURSOR;
if (yych != '"') goto yy19;
++YYCURSOR;
-#line 670 "ext/standard/var_unserializer.re"
+#line 693 "ext/standard/var_unserializer.re"
{
size_t len, len2, len3, maxlen;
long elements;
@@ -750,7 +750,7 @@
yych = *++YYCURSOR;
if (yych != '"') goto yy19;
++YYCURSOR;
-#line 662 "ext/standard/var_unserializer.re"
+#line 685 "ext/standard/var_unserializer.re"
{
INIT_PZVAL(*rval);
@@ -779,7 +779,7 @@
yych = *++YYCURSOR;
if (yych != '{') goto yy19;
++YYCURSOR;
-#line 642 "ext/standard/var_unserializer.re"
+#line 665 "ext/standard/var_unserializer.re"
{
long elements = parse_iv(start + 2);
/* use iv() not uiv() in order to check data range */
@@ -820,7 +820,7 @@
yych = *++YYCURSOR;
if (yych != '"') goto yy19;
++YYCURSOR;
-#line 613 "ext/standard/var_unserializer.re"
+#line 636 "ext/standard/var_unserializer.re"
{
size_t len, maxlen;
UChar *ustr;
@@ -870,7 +870,7 @@
yych = *++YYCURSOR;
if (yych != '"') goto yy19;
++YYCURSOR;
-#line 584 "ext/standard/var_unserializer.re"
+#line 607 "ext/standard/var_unserializer.re"
{
size_t len, maxlen;
char *str;
@@ -920,7 +920,7 @@
yych = *++YYCURSOR;
if (yych != '"') goto yy19;
++YYCURSOR;
-#line 556 "ext/standard/var_unserializer.re"
+#line 579 "ext/standard/var_unserializer.re"
{
size_t len, maxlen;
char *str;
@@ -1036,14 +1036,17 @@
}
yy71:
++YYCURSOR;
-#line 549 "ext/standard/var_unserializer.re"
+#line 569 "ext/standard/var_unserializer.re"
{
+#if SIZEOF_LONG == 4
+use_double:
+#endif
*p = YYCURSOR;
INIT_PZVAL(*rval);
ZVAL_DOUBLE(*rval, zend_strtod((const char *)start + 2, NULL));
return 1;
}
-#line 1047 "ext/standard/var_unserializer.c"
+#line 1050 "ext/standard/var_unserializer.c"
yy73:
yych = *++YYCURSOR;
if (yych <= ',') {
@@ -1102,7 +1105,7 @@
yych = *++YYCURSOR;
if (yych != ';') goto yy19;
++YYCURSOR;
-#line 534 "ext/standard/var_unserializer.re"
+#line 554 "ext/standard/var_unserializer.re"
{
*p = YYCURSOR;
INIT_PZVAL(*rval);
@@ -1117,7 +1120,7 @@
return 1;
}
-#line 1121 "ext/standard/var_unserializer.c"
+#line 1124 "ext/standard/var_unserializer.c"
yy84:
yych = *++YYCURSOR;
if (yych == 'N') goto yy81;
@@ -1146,12 +1149,32 @@
++YYCURSOR;
#line 527 "ext/standard/var_unserializer.re"
{
+#if SIZEOF_LONG == 4
+ int digits = YYCURSOR - start - 3;
+
+ if (start[2] == '-' || start[2] == '+') {
+ digits--;
+ }
+
+ /* Use double for large long values that were serialized on a 64-bit
system */
+ if (digits >= MAX_LENGTH_OF_LONG - 1) {
+ if (digits == MAX_LENGTH_OF_LONG - 1) {
+ int cmp = strncmp(YYCURSOR - MAX_LENGTH_OF_LONG,
long_min_digits, MAX_LENGTH_OF_LONG - 1);
+
+ if (!(cmp < 0 || (cmp == 0 && start[2] == '-'))) {
+ goto use_double;
+ }
+ } else {
+ goto use_double;
+ }
+ }
+#endif
*p = YYCURSOR;
INIT_PZVAL(*rval);
ZVAL_LONG(*rval, parse_iv(start + 2));
return 1;
}
-#line 1155 "ext/standard/var_unserializer.c"
+#line 1178 "ext/standard/var_unserializer.c"
yy91:
yych = *++YYCURSOR;
if (yych <= '/') goto yy19;
@@ -1166,7 +1189,7 @@
ZVAL_BOOL(*rval, parse_iv(start + 2));
return 1;
}
-#line 1170 "ext/standard/var_unserializer.c"
+#line 1193 "ext/standard/var_unserializer.c"
yy95:
++YYCURSOR;
#line 513 "ext/standard/var_unserializer.re"
@@ -1176,7 +1199,7 @@
ZVAL_NULL(*rval);
return 1;
}
-#line 1180 "ext/standard/var_unserializer.c"
+#line 1203 "ext/standard/var_unserializer.c"
yy97:
yych = *++YYCURSOR;
if (yych <= ',') {
@@ -1222,7 +1245,7 @@
return 1;
}
-#line 1226 "ext/standard/var_unserializer.c"
+#line 1249 "ext/standard/var_unserializer.c"
yy103:
yych = *++YYCURSOR;
if (yych <= ',') {
@@ -1266,9 +1289,9 @@
return 1;
}
-#line 1270 "ext/standard/var_unserializer.c"
+#line 1293 "ext/standard/var_unserializer.c"
}
-#line 796 "ext/standard/var_unserializer.re"
+#line 819 "ext/standard/var_unserializer.re"
return 0;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.re?r1=1.75&r2=1.76&diff_format=u
Index: php-src/ext/standard/var_unserializer.re
diff -u php-src/ext/standard/var_unserializer.re:1.75
php-src/ext/standard/var_unserializer.re:1.76
--- php-src/ext/standard/var_unserializer.re:1.75 Fri Aug 29 14:59:41 2008
+++ php-src/ext/standard/var_unserializer.re Tue Mar 17 22:02:05 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var_unserializer.re,v 1.75 2008/08/29 14:59:41 dmitry Exp $ */
+/* $Id: var_unserializer.re,v 1.76 2009/03/17 22:02:05 mattwil Exp $ */
#include "php.h"
#include "ext/standard/php_var.h"
@@ -525,6 +525,26 @@
}
"i:" iv ";" {
+#if SIZEOF_LONG == 4
+ int digits = YYCURSOR - start - 3;
+
+ if (start[2] == '-' || start[2] == '+') {
+ digits--;
+ }
+
+ /* Use double for large long values that were serialized on a 64-bit
system */
+ if (digits >= MAX_LENGTH_OF_LONG - 1) {
+ if (digits == MAX_LENGTH_OF_LONG - 1) {
+ int cmp = strncmp(YYCURSOR - MAX_LENGTH_OF_LONG,
long_min_digits, MAX_LENGTH_OF_LONG - 1);
+
+ if (!(cmp < 0 || (cmp == 0 && start[2] == '-'))) {
+ goto use_double;
+ }
+ } else {
+ goto use_double;
+ }
+ }
+#endif
*p = YYCURSOR;
INIT_PZVAL(*rval);
ZVAL_LONG(*rval, parse_iv(start + 2));
@@ -547,6 +567,9 @@
}
"d:" (iv | nv | nvexp) ";" {
+#if SIZEOF_LONG == 4
+use_double:
+#endif
*p = YYCURSOR;
INIT_PZVAL(*rval);
ZVAL_DOUBLE(*rval, zend_strtod((const char *)start + 2, NULL));
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/bug46882.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/serialize/bug46882.phpt
+++ php-src/ext/standard/tests/serialize/bug46882.phpt
--TEST--
Bug #46882 (Serialize / Unserialize misbehaviour under OS with different bit
numbers)
--FILE--
<?php
var_dump(unserialize('i:5000000000;') == 5000000000);
?>
--EXPECT--
bool(true)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
