From: Matt Wilmas <mattwil@php.net>
Date: Tue, 17 Mar 2009 22:02:05 +0000 (+0000)
Subject: Fixed bug #46882 (Serialize / Unserialize misbehaviour under OS with different bit... 
X-Git-Tag: php-5.4.0alpha1~191^2~4123
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0c200698514b69053e6abb26020c732074d314d8;p=php

Fixed bug #46882 (Serialize / Unserialize misbehaviour under OS with different bit numbers)
---

diff --git a/ext/standard/tests/serialize/bug46882.phpt b/ext/standard/tests/serialize/bug46882.phpt
new file mode 100644
index 0000000000..cc64c64a99
--- /dev/null
+++ b/ext/standard/tests/serialize/bug46882.phpt
@@ -0,0 +1,8 @@
+--TEST--
+Bug #46882 (Serialize / Unserialize misbehaviour under OS with different bit numbers)
+--FILE--
+<?php
+var_dump(unserialize('i:5000000000;') == 5000000000);
+?>
+--EXPECT--
+bool(true)
diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
index 37a2d79a8e..857913587f 100644
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@ -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                                |
   +----------------------------------------------------------------------+
@@ -522,7 +522,7 @@ yy2:
 	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 @@ yy14:
 	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 @@ yy21:
 	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 @@ yy28:
 	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 @@ yy35:
 	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 @@ yy42:
 	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 @@ yy49:
 	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 @@ yy56:
 	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 @@ yy69:
 	}
 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 @@ yy81:
 	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 @@ yy81:
 
 	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 @@ yy87:
 	++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 @@ yy91:
 	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 @@ yy95:
 	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 @@ yy99:
 
 	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 @@ yy105:
 
 	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;
diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re
index 30592f8717..8447a7770a 100644
--- a/ext/standard/var_unserializer.re
+++ b/ext/standard/var_unserializer.re
@@ -525,6 +525,26 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER)
 }
 
 "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 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER)
 }
 
 "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));