cataphract Wed, 28 Sep 2011 14:47:42 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=317438
Log:
- Fixed #55798: serialize followed by unserialize with numeric object prop.
gives integer prop.
Bug: https://bugs.php.net/55798 (Assigned) serialize followed by unserialize
with numeric object prop. gives integer prop.
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
A php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/bug55798.phpt
U php/php-src/branches/PHP_5_3/ext/standard/var_unserializer.c
U php/php-src/branches/PHP_5_3/ext/standard/var_unserializer.re
A php/php-src/branches/PHP_5_4/ext/standard/tests/serialize/bug55798.phpt
U php/php-src/branches/PHP_5_4/ext/standard/var_unserializer.c
U php/php-src/branches/PHP_5_4/ext/standard/var_unserializer.re
A php/php-src/trunk/ext/standard/tests/serialize/bug55798.phpt
U php/php-src/trunk/ext/standard/var_unserializer.c
U php/php-src/trunk/ext/standard/var_unserializer.re
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2011-09-28 13:50:03 UTC (rev 317437)
+++ php/php-src/branches/PHP_5_3/NEWS 2011-09-28 14:47:42 UTC (rev 317438)
@@ -3,6 +3,8 @@
?? ??? 2011, PHP 5.3.9
- Core:
+ . Fixed bug #55798 (serialize followed by unserialize with numeric object
+ prop. gives integer prop). (Gustavo)
. Fixed bug #55749 (TOCTOU issue in getenv() on Windows builds). (Pierre)
. Fixed bug #55707 (undefined reference to `__sync_fetch_and_add_4' on Linux
parisc). (Felipe)
Added: php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/bug55798.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/bug55798.phpt (rev 0)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/bug55798.phpt 2011-09-28 14:47:42 UTC (rev 317438)
@@ -0,0 +1,18 @@
+--TEST--
+Bug #55798 (serialize followed by unserialize with numeric object prop. gives integer prop)
+--FILE--
+<?php
+
+$a = new stdClass();
+$a->{0} = 'X';
+$a->{1} = 'Y';
+var_dump(serialize($a));
+var_dump($a->{0});
+$b = unserialize(serialize($a));
+var_dump(serialize($b));
+var_dump($b->{0});
+--EXPECT--
+string(51) "O:8:"stdClass":2:{s:1:"0";s:1:"X";s:1:"1";s:1:"Y";}"
+string(1) "X"
+string(51) "O:8:"stdClass":2:{s:1:"0";s:1:"X";s:1:"1";s:1:"Y";}"
+string(1) "X"
Property changes on: php/php-src/branches/PHP_5_3/ext/standard/tests/serialize/bug55798.phpt
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision
Added: svn:eol-style
+ native
Modified: php/php-src/branches/PHP_5_3/ext/standard/var_unserializer.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/var_unserializer.c 2011-09-28 13:50:03 UTC (rev 317437)
+++ php/php-src/branches/PHP_5_3/ext/standard/var_unserializer.c 2011-09-28 14:47:42 UTC (rev 317438)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Fri Dec 31 23:52:55 2010 */
+/* Generated by re2c 0.13.5 on Wed Sep 28 15:40:15 2011 */
#line 1 "ext/standard/var_unserializer.re"
/*
+----------------------------------------------------------------------+
@@ -253,7 +253,7 @@
#define UNSERIALIZE_PARAMETER zval **rval, const unsigned char **p, const unsigned char *max, php_unserialize_data_t *var_hash TSRMLS_DC
#define UNSERIALIZE_PASSTHRU rval, p, max, var_hash TSRMLS_CC
-static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, long elements)
+static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, long elements, int objprops)
{
while (elements-- > 0) {
zval *key, *data, **old_data;
@@ -282,7 +282,8 @@
return 0;
}
- switch (Z_TYPE_P(key)) {
+ if (!objprops) {
+ switch (Z_TYPE_P(key)) {
case IS_LONG:
if (zend_hash_index_find(ht, Z_LVAL_P(key), (void **)&old_data)==SUCCESS) {
var_push_dtor(var_hash, old_data);
@@ -295,6 +296,12 @@
}
zend_symtable_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data, sizeof(data), NULL);
break;
+ }
+ } else {
+ /* object properties should include no integers */
+ convert_to_string(key);
+ zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data,
+ sizeof data, NULL);
}
zval_dtor(key);
@@ -362,7 +369,7 @@
zval *retval_ptr = NULL;
zval fname;
- if (!process_nested_data(UNSERIALIZE_PASSTHRU, Z_OBJPROP_PP(rval), elements)) {
+ if (!process_nested_data(UNSERIALIZE_PASSTHRU, Z_OBJPROP_PP(rval), elements, 1)) {
return 0;
}
@@ -396,7 +403,7 @@
-#line 400 "ext/standard/var_unserializer.c"
+#line 407 "ext/standard/var_unserializer.c"
{
YYCTYPE yych;
static const unsigned char yybm[] = {
@@ -456,9 +463,9 @@
yych = *(YYMARKER = ++YYCURSOR);
if (yych == ':') goto yy95;
yy3:
-#line 722 "ext/standard/var_unserializer.re"
+#line 729 "ext/standard/var_unserializer.re"
{ return 0; }
-#line 462 "ext/standard/var_unserializer.c"
+#line 469 "ext/standard/var_unserializer.c"
yy4:
yych = *(YYMARKER = ++YYCURSOR);
if (yych == ':') goto yy89;
@@ -501,13 +508,13 @@
goto yy3;
yy14:
++YYCURSOR;
-#line 716 "ext/standard/var_unserializer.re"
+#line 723 "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");
return 0; /* not sure if it should be 0 or 1 here? */
}
-#line 511 "ext/standard/var_unserializer.c"
+#line 518 "ext/standard/var_unserializer.c"
yy16:
yych = *++YYCURSOR;
goto yy3;
@@ -537,7 +544,7 @@
yych = *++YYCURSOR;
if (yych != '"') goto yy18;
++YYCURSOR;
-#line 599 "ext/standard/var_unserializer.re"
+#line 606 "ext/standard/var_unserializer.re"
{
size_t len, len2, len3, maxlen;
long elements;
@@ -654,7 +661,7 @@
return object_common2(UNSERIALIZE_PASSTHRU, elements);
}
-#line 658 "ext/standard/var_unserializer.c"
+#line 665 "ext/standard/var_unserializer.c"
yy25:
yych = *++YYCURSOR;
if (yych <= ',') {
@@ -679,7 +686,7 @@
yych = *++YYCURSOR;
if (yych != '"') goto yy18;
++YYCURSOR;
-#line 591 "ext/standard/var_unserializer.re"
+#line 598 "ext/standard/var_unserializer.re"
{
INIT_PZVAL(*rval);
@@ -687,7 +694,7 @@
return object_common2(UNSERIALIZE_PASSTHRU,
object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR));
}
-#line 691 "ext/standard/var_unserializer.c"
+#line 698 "ext/standard/var_unserializer.c"
yy32:
yych = *++YYCURSOR;
if (yych == '+') goto yy33;
@@ -708,7 +715,7 @@
yych = *++YYCURSOR;
if (yych != '{') goto yy18;
++YYCURSOR;
-#line 571 "ext/standard/var_unserializer.re"
+#line 578 "ext/standard/var_unserializer.re"
{
long elements = parse_iv(start + 2);
/* use iv() not uiv() in order to check data range */
@@ -722,13 +729,13 @@
array_init_size(*rval, elements);
- if (!process_nested_data(UNSERIALIZE_PASSTHRU, Z_ARRVAL_PP(rval), elements)) {
+ if (!process_nested_data(UNSERIALIZE_PASSTHRU, Z_ARRVAL_PP(rval), elements, 0)) {
return 0;
}
return finish_nested_data(UNSERIALIZE_PASSTHRU);
}
-#line 732 "ext/standard/var_unserializer.c"
+#line 739 "ext/standard/var_unserializer.c"
yy39:
yych = *++YYCURSOR;
if (yych == '+') goto yy40;
@@ -749,7 +756,7 @@
yych = *++YYCURSOR;
if (yych != '"') goto yy18;
++YYCURSOR;
-#line 542 "ext/standard/var_unserializer.re"
+#line 549 "ext/standard/var_unserializer.re"
{
size_t len, maxlen;
char *str;
@@ -778,7 +785,7 @@
ZVAL_STRINGL(*rval, str, len, 0);
return 1;
}
-#line 782 "ext/standard/var_unserializer.c"
+#line 789 "ext/standard/var_unserializer.c"
yy46:
yych = *++YYCURSOR;
if (yych == '+') goto yy47;
@@ -799,7 +806,7 @@
yych = *++YYCURSOR;
if (yych != '"') goto yy18;
++YYCURSOR;
-#line 514 "ext/standard/var_unserializer.re"
+#line 521 "ext/standard/var_unserializer.re"
{
size_t len, maxlen;
char *str;
@@ -827,7 +834,7 @@
ZVAL_STRINGL(*rval, str, len, 1);
return 1;
}
-#line 831 "ext/standard/var_unserializer.c"
+#line 838 "ext/standard/var_unserializer.c"
yy53:
yych = *++YYCURSOR;
if (yych <= '/') {
@@ -915,7 +922,7 @@
}
yy63:
++YYCURSOR;
-#line 504 "ext/standard/var_unserializer.re"
+#line 511 "ext/standard/var_unserializer.re"
{
#if SIZEOF_LONG == 4
use_double:
@@ -925,7 +932,7 @@
ZVAL_DOUBLE(*rval, zend_strtod((const char *)start + 2, NULL));
return 1;
}
-#line 929 "ext/standard/var_unserializer.c"
+#line 936 "ext/standard/var_unserializer.c"
yy65:
yych = *++YYCURSOR;
if (yych <= ',') {
@@ -984,7 +991,7 @@
yych = *++YYCURSOR;
if (yych != ';') goto yy18;
++YYCURSOR;
-#line 489 "ext/standard/var_unserializer.re"
+#line 496 "ext/standard/var_unserializer.re"
{
*p = YYCURSOR;
INIT_PZVAL(*rval);
@@ -999,7 +1006,7 @@
return 1;
}
-#line 1003 "ext/standard/var_unserializer.c"
+#line 1010 "ext/standard/var_unserializer.c"
yy76:
yych = *++YYCURSOR;
if (yych == 'N') goto yy73;
@@ -1026,7 +1033,7 @@
if (yych <= '9') goto yy79;
if (yych != ';') goto yy18;
++YYCURSOR;
-#line 462 "ext/standard/var_unserializer.re"
+#line 469 "ext/standard/var_unserializer.re"
{
#if SIZEOF_LONG == 4
int digits = YYCURSOR - start - 3;
@@ -1053,7 +1060,7 @@
ZVAL_LONG(*rval, parse_iv(start + 2));
return 1;
}
-#line 1057 "ext/standard/var_unserializer.c"
+#line 1064 "ext/standard/var_unserializer.c"
yy83:
yych = *++YYCURSOR;
if (yych <= '/') goto yy18;
@@ -1061,24 +1068,24 @@
yych = *++YYCURSOR;
if (yych != ';') goto yy18;
++YYCURSOR;
-#line 455 "ext/standard/var_unserializer.re"
+#line 462 "ext/standard/var_unserializer.re"
{
*p = YYCURSOR;
INIT_PZVAL(*rval);
ZVAL_BOOL(*rval, parse_iv(start + 2));
return 1;
}
-#line 1072 "ext/standard/var_unserializer.c"
+#line 1079 "ext/standard/var_unserializer.c"
yy87:
++YYCURSOR;
-#line 448 "ext/standard/var_unserializer.re"
+#line 455 "ext/standard/var_unserializer.re"
{
*p = YYCURSOR;
INIT_PZVAL(*rval);
ZVAL_NULL(*rval);
return 1;
}
-#line 1082 "ext/standard/var_unserializer.c"
+#line 1089 "ext/standard/var_unserializer.c"
yy89:
yych = *++YYCURSOR;
if (yych <= ',') {
@@ -1101,7 +1108,7 @@
if (yych <= '9') goto yy91;
if (yych != ';') goto yy18;
++YYCURSOR;
-#line 425 "ext/standard/var_unserializer.re"
+#line 432 "ext/standard/var_unserializer.re"
{
long id;
@@ -1124,7 +1131,7 @@
return 1;
}
-#line 1128 "ext/standard/var_unserializer.c"
+#line 1135 "ext/standard/var_unserializer.c"
yy95:
yych = *++YYCURSOR;
if (yych <= ',') {
@@ -1147,7 +1154,7 @@
if (yych <= '9') goto yy97;
if (yych != ';') goto yy18;
++YYCURSOR;
-#line 404 "ext/standard/var_unserializer.re"
+#line 411 "ext/standard/var_unserializer.re"
{
long id;
@@ -1168,9 +1175,9 @@
return 1;
}
-#line 1172 "ext/standard/var_unserializer.c"
+#line 1179 "ext/standard/var_unserializer.c"
}
-#line 724 "ext/standard/var_unserializer.re"
+#line 731 "ext/standard/var_unserializer.re"
return 0;
Modified: php/php-src/branches/PHP_5_3/ext/standard/var_unserializer.re
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/var_unserializer.re 2011-09-28 13:50:03 UTC (rev 317437)
+++ php/php-src/branches/PHP_5_3/ext/standard/var_unserializer.re 2011-09-28 14:47:42 UTC (rev 317438)
@@ -257,7 +257,7 @@
#define UNSERIALIZE_PARAMETER zval **rval, const unsigned char **p, const unsigned char *max, php_unserialize_data_t *var_hash TSRMLS_DC
#define UNSERIALIZE_PASSTHRU rval, p, max, var_hash TSRMLS_CC
-static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, long elements)
+static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, long elements, int objprops)
{
while (elements-- > 0) {
zval *key, *data, **old_data;
@@ -286,7 +286,8 @@
return 0;
}
- switch (Z_TYPE_P(key)) {
+ if (!objprops) {
+ switch (Z_TYPE_P(key)) {
case IS_LONG:
if (zend_hash_index_find(ht, Z_LVAL_P(key), (void **)&old_data)==SUCCESS) {
var_push_dtor(var_hash, old_data);
@@ -299,6 +300,12 @@
}
zend_symtable_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data, sizeof(data), NULL);
break;
+ }
+ } else {
+ /* object properties should include no integers */
+ convert_to_string(key);
+ zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data,
+ sizeof data, NULL);
}
zval_dtor(key);
@@ -366,7 +373,7 @@
zval *retval_ptr = NULL;
zval fname;
- if (!process_nested_data(UNSERIALIZE_PASSTHRU, Z_OBJPROP_PP(rval), elements)) {
+ if (!process_nested_data(UNSERIALIZE_PASSTHRU, Z_OBJPROP_PP(rval), elements, 1)) {
return 0;
}
@@ -581,7 +588,7 @@
array_init_size(*rval, elements);
- if (!process_nested_data(UNSERIALIZE_PASSTHRU, Z_ARRVAL_PP(rval), elements)) {
+ if (!process_nested_data(UNSERIALIZE_PASSTHRU, Z_ARRVAL_PP(rval), elements, 0)) {
return 0;
}
Added: php/php-src/branches/PHP_5_4/ext/standard/tests/serialize/bug55798.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/serialize/bug55798.phpt (rev 0)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/serialize/bug55798.phpt 2011-09-28 14:47:42 UTC (rev 317438)
@@ -0,0 +1,18 @@
+--TEST--
+Bug #55798 (serialize followed by unserialize with numeric object prop. gives integer prop)
+--FILE--
+<?php
+
+$a = new stdClass();
+$a->{0} = 'X';
+$a->{1} = 'Y';
+var_dump(serialize($a));
+var_dump($a->{0});
+$b = unserialize(serialize($a));
+var_dump(serialize($b));
+var_dump($b->{0});
+--EXPECT--
+string(51) "O:8:"stdClass":2:{s:1:"0";s:1:"X";s:1:"1";s:1:"Y";}"
+string(1) "X"
+string(51) "O:8:"stdClass":2:{s:1:"0";s:1:"X";s:1:"1";s:1:"Y";}"
+string(1) "X"
Property changes on: php/php-src/branches/PHP_5_4/ext/standard/tests/serialize/bug55798.phpt
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision
Added: svn:eol-style
+ native
Modified: php/php-src/branches/PHP_5_4/ext/standard/var_unserializer.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/var_unserializer.c 2011-09-28 13:50:03 UTC (rev 317437)
+++ php/php-src/branches/PHP_5_4/ext/standard/var_unserializer.c 2011-09-28 14:47:42 UTC (rev 317438)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Sat Sep 18 17:59:40 2010 */
+/* Generated by re2c 0.13.5 on Wed Sep 28 15:27:03 2011 */
#line 1 "ext/standard/var_unserializer.re"
/*
+----------------------------------------------------------------------+
@@ -264,7 +264,7 @@
#define UNSERIALIZE_PARAMETER zval **rval, const unsigned char **p, const unsigned char *max, php_unserialize_data_t *var_hash TSRMLS_DC
#define UNSERIALIZE_PASSTHRU rval, p, max, var_hash TSRMLS_CC
-static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, long elements)
+static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, long elements, int objprops)
{
while (elements-- > 0) {
zval *key, *data, **old_data;
@@ -293,7 +293,8 @@
return 0;
}
- switch (Z_TYPE_P(key)) {
+ if (!objprops) {
+ switch (Z_TYPE_P(key)) {
case IS_LONG:
if (zend_hash_index_find(ht, Z_LVAL_P(key), (void **)&old_data)==SUCCESS) {
var_push_dtor(var_hash, old_data);
@@ -306,6 +307,12 @@
}
zend_symtable_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data, sizeof(data), NULL);
break;
+ }
+ } else {
+ /* object properties should include no integers */
+ convert_to_string(key);
+ zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data,
+ sizeof data, NULL);
}
zval_dtor(key);
@@ -373,7 +380,7 @@
zval *retval_ptr = NULL;
zval fname;
- if (!process_nested_data(UNSERIALIZE_PASSTHRU, Z_OBJPROP_PP(rval), elements)) {
+ if (!process_nested_data(UNSERIALIZE_PASSTHRU, Z_OBJPROP_PP(rval), elements, 1)) {
return 0;
}
@@ -407,7 +414,7 @@
-#line 411 "ext/standard/var_unserializer.c"
+#line 418 "ext/standard/var_unserializer.c"
{
YYCTYPE yych;
@@ -436,9 +443,9 @@
default: goto yy3;
}
yy3:
-#line 733 "ext/standard/var_unserializer.re"
+#line 740 "ext/standard/var_unserializer.re"
{ return 0; }
-#line 442 "ext/standard/var_unserializer.c"
+#line 449 "ext/standard/var_unserializer.c"
yy4:
yych = *(YYMARKER = ++YYCURSOR);
switch (yych) {
@@ -501,13 +508,13 @@
}
yy14:
++YYCURSOR;
-#line 727 "ext/standard/var_unserializer.re"
+#line 734 "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");
return 0; /* not sure if it should be 0 or 1 here? */
}
-#line 511 "ext/standard/var_unserializer.c"
+#line 518 "ext/standard/var_unserializer.c"
yy16:
yych = *++YYCURSOR;
goto yy3;
@@ -571,7 +578,7 @@
}
yy23:
++YYCURSOR;
-#line 610 "ext/standard/var_unserializer.re"
+#line 617 "ext/standard/var_unserializer.re"
{
size_t len, len2, len3, maxlen;
long elements;
@@ -688,7 +695,7 @@
return object_common2(UNSERIALIZE_PASSTHRU, elements);
}
-#line 692 "ext/standard/var_unserializer.c"
+#line 699 "ext/standard/var_unserializer.c"
yy25:
yych = *++YYCURSOR;
switch (yych) {
@@ -747,7 +754,7 @@
}
yy30:
++YYCURSOR;
-#line 602 "ext/standard/var_unserializer.re"
+#line 609 "ext/standard/var_unserializer.re"
{
INIT_PZVAL(*rval);
@@ -755,7 +762,7 @@
return object_common2(UNSERIALIZE_PASSTHRU,
object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR));
}
-#line 759 "ext/standard/var_unserializer.c"
+#line 766 "ext/standard/var_unserializer.c"
yy32:
yych = *++YYCURSOR;
switch (yych) {
@@ -813,7 +820,7 @@
}
yy37:
++YYCURSOR;
-#line 582 "ext/standard/var_unserializer.re"
+#line 589 "ext/standard/var_unserializer.re"
{
long elements = parse_iv(start + 2);
/* use iv() not uiv() in order to check data range */
@@ -827,13 +834,13 @@
array_init_size(*rval, elements);
- if (!process_nested_data(UNSERIALIZE_PASSTHRU, Z_ARRVAL_PP(rval), elements)) {
+ if (!process_nested_data(UNSERIALIZE_PASSTHRU, Z_ARRVAL_PP(rval), elements, 0)) {
return 0;
}
return finish_nested_data(UNSERIALIZE_PASSTHRU);
}
-#line 837 "ext/standard/var_unserializer.c"
+#line 844 "ext/standard/var_unserializer.c"
yy39:
yych = *++YYCURSOR;
switch (yych) {
@@ -891,7 +898,7 @@
}
yy44:
++YYCURSOR;
-#line 553 "ext/standard/var_unserializer.re"
+#line 560 "ext/standard/var_unserializer.re"
{
size_t len, maxlen;
char *str;
@@ -920,7 +927,7 @@
ZVAL_STRINGL(*rval, str, len, 0);
return 1;
}
-#line 924 "ext/standard/var_unserializer.c"
+#line 931 "ext/standard/var_unserializer.c"
yy46:
yych = *++YYCURSOR;
switch (yych) {
@@ -978,7 +985,7 @@
}
yy51:
++YYCURSOR;
-#line 525 "ext/standard/var_unserializer.re"
+#line 532 "ext/standard/var_unserializer.re"
{
size_t len, maxlen;
char *str;
@@ -1006,7 +1013,7 @@
ZVAL_STRINGL(*rval, str, len, 1);
return 1;
}
-#line 1010 "ext/standard/var_unserializer.c"
+#line 1017 "ext/standard/var_unserializer.c"
yy53:
yych = *++YYCURSOR;
switch (yych) {
@@ -1130,7 +1137,7 @@
}
yy63:
++YYCURSOR;
-#line 515 "ext/standard/var_unserializer.re"
+#line 522 "ext/standard/var_unserializer.re"
{
#if SIZEOF_LONG == 4
use_double:
@@ -1140,7 +1147,7 @@
ZVAL_DOUBLE(*rval, zend_strtod((const char *)start + 2, NULL));
return 1;
}
-#line 1144 "ext/standard/var_unserializer.c"
+#line 1151 "ext/standard/var_unserializer.c"
yy65:
yych = *++YYCURSOR;
switch (yych) {
@@ -1242,7 +1249,7 @@
}
yy74:
++YYCURSOR;
-#line 500 "ext/standard/var_unserializer.re"
+#line 507 "ext/standard/var_unserializer.re"
{
*p = YYCURSOR;
INIT_PZVAL(*rval);
@@ -1257,7 +1264,7 @@
return 1;
}
-#line 1261 "ext/standard/var_unserializer.c"
+#line 1268 "ext/standard/var_unserializer.c"
yy76:
yych = *++YYCURSOR;
switch (yych) {
@@ -1316,7 +1323,7 @@
}
yy81:
++YYCURSOR;
-#line 473 "ext/standard/var_unserializer.re"
+#line 480 "ext/standard/var_unserializer.re"
{
#if SIZEOF_LONG == 4
int digits = YYCURSOR - start - 3;
@@ -1343,7 +1350,7 @@
ZVAL_LONG(*rval, parse_iv(start + 2));
return 1;
}
-#line 1347 "ext/standard/var_unserializer.c"
+#line 1354 "ext/standard/var_unserializer.c"
yy83:
yych = *++YYCURSOR;
switch (yych) {
@@ -1359,24 +1366,24 @@
}
yy85:
++YYCURSOR;
-#line 466 "ext/standard/var_unserializer.re"
+#line 473 "ext/standard/var_unserializer.re"
{
*p = YYCURSOR;
INIT_PZVAL(*rval);
ZVAL_BOOL(*rval, parse_iv(start + 2));
return 1;
}
-#line 1370 "ext/standard/var_unserializer.c"
+#line 1377 "ext/standard/var_unserializer.c"
yy87:
++YYCURSOR;
-#line 459 "ext/standard/var_unserializer.re"
+#line 466 "ext/standard/var_unserializer.re"
{
*p = YYCURSOR;
INIT_PZVAL(*rval);
ZVAL_NULL(*rval);
return 1;
}
-#line 1380 "ext/standard/var_unserializer.c"
+#line 1387 "ext/standard/var_unserializer.c"
yy89:
yych = *++YYCURSOR;
switch (yych) {
@@ -1429,7 +1436,7 @@
}
yy93:
++YYCURSOR;
-#line 436 "ext/standard/var_unserializer.re"
+#line 443 "ext/standard/var_unserializer.re"
{
long id;
@@ -1452,7 +1459,7 @@
return 1;
}
-#line 1456 "ext/standard/var_unserializer.c"
+#line 1463 "ext/standard/var_unserializer.c"
yy95:
yych = *++YYCURSOR;
switch (yych) {
@@ -1505,7 +1512,7 @@
}
yy99:
++YYCURSOR;
-#line 415 "ext/standard/var_unserializer.re"
+#line 422 "ext/standard/var_unserializer.re"
{
long id;
@@ -1526,9 +1533,9 @@
return 1;
}
-#line 1530 "ext/standard/var_unserializer.c"
+#line 1537 "ext/standard/var_unserializer.c"
}
-#line 735 "ext/standard/var_unserializer.re"
+#line 742 "ext/standard/var_unserializer.re"
return 0;
Modified: php/php-src/branches/PHP_5_4/ext/standard/var_unserializer.re
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/var_unserializer.re 2011-09-28 13:50:03 UTC (rev 317437)
+++ php/php-src/branches/PHP_5_4/ext/standard/var_unserializer.re 2011-09-28 14:47:42 UTC (rev 317438)
@@ -268,7 +268,7 @@
#define UNSERIALIZE_PARAMETER zval **rval, const unsigned char **p, const unsigned char *max, php_unserialize_data_t *var_hash TSRMLS_DC
#define UNSERIALIZE_PASSTHRU rval, p, max, var_hash TSRMLS_CC
-static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, long elements)
+static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, long elements, int objprops)
{
while (elements-- > 0) {
zval *key, *data, **old_data;
@@ -297,7 +297,8 @@
return 0;
}
- switch (Z_TYPE_P(key)) {
+ if (!objprops) {
+ switch (Z_TYPE_P(key)) {
case IS_LONG:
if (zend_hash_index_find(ht, Z_LVAL_P(key), (void **)&old_data)==SUCCESS) {
var_push_dtor(var_hash, old_data);
@@ -310,6 +311,12 @@
}
zend_symtable_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data, sizeof(data), NULL);
break;
+ }
+ } else {
+ /* object properties should include no integers */
+ convert_to_string(key);
+ zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data,
+ sizeof data, NULL);
}
zval_dtor(key);
@@ -377,7 +384,7 @@
zval *retval_ptr = NULL;
zval fname;
- if (!process_nested_data(UNSERIALIZE_PASSTHRU, Z_OBJPROP_PP(rval), elements)) {
+ if (!process_nested_data(UNSERIALIZE_PASSTHRU, Z_OBJPROP_PP(rval), elements, 1)) {
return 0;
}
@@ -592,7 +599,7 @@
array_init_size(*rval, elements);
- if (!process_nested_data(UNSERIALIZE_PASSTHRU, Z_ARRVAL_PP(rval), elements)) {
+ if (!process_nested_data(UNSERIALIZE_PASSTHRU, Z_ARRVAL_PP(rval), elements, 0)) {
return 0;
}
Added: php/php-src/trunk/ext/standard/tests/serialize/bug55798.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/serialize/bug55798.phpt (rev 0)
+++ php/php-src/trunk/ext/standard/tests/serialize/bug55798.phpt 2011-09-28 14:47:42 UTC (rev 317438)
@@ -0,0 +1,18 @@
+--TEST--
+Bug #55798 (serialize followed by unserialize with numeric object prop. gives integer prop)
+--FILE--
+<?php
+
+$a = new stdClass();
+$a->{0} = 'X';
+$a->{1} = 'Y';
+var_dump(serialize($a));
+var_dump($a->{0});
+$b = unserialize(serialize($a));
+var_dump(serialize($b));
+var_dump($b->{0});
+--EXPECT--
+string(51) "O:8:"stdClass":2:{s:1:"0";s:1:"X";s:1:"1";s:1:"Y";}"
+string(1) "X"
+string(51) "O:8:"stdClass":2:{s:1:"0";s:1:"X";s:1:"1";s:1:"Y";}"
+string(1) "X"
Property changes on: php/php-src/trunk/ext/standard/tests/serialize/bug55798.phpt
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision
Added: svn:eol-style
+ native
Modified: php/php-src/trunk/ext/standard/var_unserializer.c
===================================================================
--- php/php-src/trunk/ext/standard/var_unserializer.c 2011-09-28 13:50:03 UTC (rev 317437)
+++ php/php-src/trunk/ext/standard/var_unserializer.c 2011-09-28 14:47:42 UTC (rev 317438)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Sat Sep 18 17:59:40 2010 */
+/* Generated by re2c 0.13.5 on Wed Sep 28 15:27:03 2011 */
#line 1 "ext/standard/var_unserializer.re"
/*
+----------------------------------------------------------------------+
@@ -264,7 +264,7 @@
#define UNSERIALIZE_PARAMETER zval **rval, const unsigned char **p, const unsigned char *max, php_unserialize_data_t *var_hash TSRMLS_DC
#define UNSERIALIZE_PASSTHRU rval, p, max, var_hash TSRMLS_CC
-static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, long elements)
+static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, long elements, int objprops)
{
while (elements-- > 0) {
zval *key, *data, **old_data;
@@ -293,7 +293,8 @@
return 0;
}
- switch (Z_TYPE_P(key)) {
+ if (!objprops) {
+ switch (Z_TYPE_P(key)) {
case IS_LONG:
if (zend_hash_index_find(ht, Z_LVAL_P(key), (void **)&old_data)==SUCCESS) {
var_push_dtor(var_hash, old_data);
@@ -306,6 +307,12 @@
}
zend_symtable_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data, sizeof(data), NULL);
break;
+ }
+ } else {
+ /* object properties should include no integers */
+ convert_to_string(key);
+ zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data,
+ sizeof data, NULL);
}
zval_dtor(key);
@@ -373,7 +380,7 @@
zval *retval_ptr = NULL;
zval fname;
- if (!process_nested_data(UNSERIALIZE_PASSTHRU, Z_OBJPROP_PP(rval), elements)) {
+ if (!process_nested_data(UNSERIALIZE_PASSTHRU, Z_OBJPROP_PP(rval), elements, 1)) {
return 0;
}
@@ -407,7 +414,7 @@
-#line 411 "ext/standard/var_unserializer.c"
+#line 418 "ext/standard/var_unserializer.c"
{
YYCTYPE yych;
@@ -436,9 +443,9 @@
default: goto yy3;
}
yy3:
-#line 733 "ext/standard/var_unserializer.re"
+#line 740 "ext/standard/var_unserializer.re"
{ return 0; }
-#line 442 "ext/standard/var_unserializer.c"
+#line 449 "ext/standard/var_unserializer.c"
yy4:
yych = *(YYMARKER = ++YYCURSOR);
switch (yych) {
@@ -501,13 +508,13 @@
}
yy14:
++YYCURSOR;
-#line 727 "ext/standard/var_unserializer.re"
+#line 734 "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");
return 0; /* not sure if it should be 0 or 1 here? */
}
-#line 511 "ext/standard/var_unserializer.c"
+#line 518 "ext/standard/var_unserializer.c"
yy16:
yych = *++YYCURSOR;
goto yy3;
@@ -571,7 +578,7 @@
}
yy23:
++YYCURSOR;
-#line 610 "ext/standard/var_unserializer.re"
+#line 617 "ext/standard/var_unserializer.re"
{
size_t len, len2, len3, maxlen;
long elements;
@@ -688,7 +695,7 @@
return object_common2(UNSERIALIZE_PASSTHRU, elements);
}
-#line 692 "ext/standard/var_unserializer.c"
+#line 699 "ext/standard/var_unserializer.c"
yy25:
yych = *++YYCURSOR;
switch (yych) {
@@ -747,7 +754,7 @@
}
yy30:
++YYCURSOR;
-#line 602 "ext/standard/var_unserializer.re"
+#line 609 "ext/standard/var_unserializer.re"
{
INIT_PZVAL(*rval);
@@ -755,7 +762,7 @@
return object_common2(UNSERIALIZE_PASSTHRU,
object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR));
}
-#line 759 "ext/standard/var_unserializer.c"
+#line 766 "ext/standard/var_unserializer.c"
yy32:
yych = *++YYCURSOR;
switch (yych) {
@@ -813,7 +820,7 @@
}
yy37:
++YYCURSOR;
-#line 582 "ext/standard/var_unserializer.re"
+#line 589 "ext/standard/var_unserializer.re"
{
long elements = parse_iv(start + 2);
/* use iv() not uiv() in order to check data range */
@@ -827,13 +834,13 @@
array_init_size(*rval, elements);
- if (!process_nested_data(UNSERIALIZE_PASSTHRU, Z_ARRVAL_PP(rval), elements)) {
+ if (!process_nested_data(UNSERIALIZE_PASSTHRU, Z_ARRVAL_PP(rval), elements, 0)) {
return 0;
}
return finish_nested_data(UNSERIALIZE_PASSTHRU);
}
-#line 837 "ext/standard/var_unserializer.c"
+#line 844 "ext/standard/var_unserializer.c"
yy39:
yych = *++YYCURSOR;
switch (yych) {
@@ -891,7 +898,7 @@
}
yy44:
++YYCURSOR;
-#line 553 "ext/standard/var_unserializer.re"
+#line 560 "ext/standard/var_unserializer.re"
{
size_t len, maxlen;
char *str;
@@ -920,7 +927,7 @@
ZVAL_STRINGL(*rval, str, len, 0);
return 1;
}
-#line 924 "ext/standard/var_unserializer.c"
+#line 931 "ext/standard/var_unserializer.c"
yy46:
yych = *++YYCURSOR;
switch (yych) {
@@ -978,7 +985,7 @@
}
yy51:
++YYCURSOR;
-#line 525 "ext/standard/var_unserializer.re"
+#line 532 "ext/standard/var_unserializer.re"
{
size_t len, maxlen;
char *str;
@@ -1006,7 +1013,7 @@
ZVAL_STRINGL(*rval, str, len, 1);
return 1;
}
-#line 1010 "ext/standard/var_unserializer.c"
+#line 1017 "ext/standard/var_unserializer.c"
yy53:
yych = *++YYCURSOR;
switch (yych) {
@@ -1130,7 +1137,7 @@
}
yy63:
++YYCURSOR;
-#line 515 "ext/standard/var_unserializer.re"
+#line 522 "ext/standard/var_unserializer.re"
{
#if SIZEOF_LONG == 4
use_double:
@@ -1140,7 +1147,7 @@
ZVAL_DOUBLE(*rval, zend_strtod((const char *)start + 2, NULL));
return 1;
}
-#line 1144 "ext/standard/var_unserializer.c"
+#line 1151 "ext/standard/var_unserializer.c"
yy65:
yych = *++YYCURSOR;
switch (yych) {
@@ -1242,7 +1249,7 @@
}
yy74:
++YYCURSOR;
-#line 500 "ext/standard/var_unserializer.re"
+#line 507 "ext/standard/var_unserializer.re"
{
*p = YYCURSOR;
INIT_PZVAL(*rval);
@@ -1257,7 +1264,7 @@
return 1;
}
-#line 1261 "ext/standard/var_unserializer.c"
+#line 1268 "ext/standard/var_unserializer.c"
yy76:
yych = *++YYCURSOR;
switch (yych) {
@@ -1316,7 +1323,7 @@
}
yy81:
++YYCURSOR;
-#line 473 "ext/standard/var_unserializer.re"
+#line 480 "ext/standard/var_unserializer.re"
{
#if SIZEOF_LONG == 4
int digits = YYCURSOR - start - 3;
@@ -1343,7 +1350,7 @@
ZVAL_LONG(*rval, parse_iv(start + 2));
return 1;
}
-#line 1347 "ext/standard/var_unserializer.c"
+#line 1354 "ext/standard/var_unserializer.c"
yy83:
yych = *++YYCURSOR;
switch (yych) {
@@ -1359,24 +1366,24 @@
}
yy85:
++YYCURSOR;
-#line 466 "ext/standard/var_unserializer.re"
+#line 473 "ext/standard/var_unserializer.re"
{
*p = YYCURSOR;
INIT_PZVAL(*rval);
ZVAL_BOOL(*rval, parse_iv(start + 2));
return 1;
}
-#line 1370 "ext/standard/var_unserializer.c"
+#line 1377 "ext/standard/var_unserializer.c"
yy87:
++YYCURSOR;
-#line 459 "ext/standard/var_unserializer.re"
+#line 466 "ext/standard/var_unserializer.re"
{
*p = YYCURSOR;
INIT_PZVAL(*rval);
ZVAL_NULL(*rval);
return 1;
}
-#line 1380 "ext/standard/var_unserializer.c"
+#line 1387 "ext/standard/var_unserializer.c"
yy89:
yych = *++YYCURSOR;
switch (yych) {
@@ -1429,7 +1436,7 @@
}
yy93:
++YYCURSOR;
-#line 436 "ext/standard/var_unserializer.re"
+#line 443 "ext/standard/var_unserializer.re"
{
long id;
@@ -1452,7 +1459,7 @@
return 1;
}
-#line 1456 "ext/standard/var_unserializer.c"
+#line 1463 "ext/standard/var_unserializer.c"
yy95:
yych = *++YYCURSOR;
switch (yych) {
@@ -1505,7 +1512,7 @@
}
yy99:
++YYCURSOR;
-#line 415 "ext/standard/var_unserializer.re"
+#line 422 "ext/standard/var_unserializer.re"
{
long id;
@@ -1526,9 +1533,9 @@
return 1;
}
-#line 1530 "ext/standard/var_unserializer.c"
+#line 1537 "ext/standard/var_unserializer.c"
}
-#line 735 "ext/standard/var_unserializer.re"
+#line 742 "ext/standard/var_unserializer.re"
return 0;
Modified: php/php-src/trunk/ext/standard/var_unserializer.re
===================================================================
--- php/php-src/trunk/ext/standard/var_unserializer.re 2011-09-28 13:50:03 UTC (rev 317437)
+++ php/php-src/trunk/ext/standard/var_unserializer.re 2011-09-28 14:47:42 UTC (rev 317438)
@@ -268,7 +268,7 @@
#define UNSERIALIZE_PARAMETER zval **rval, const unsigned char **p, const unsigned char *max, php_unserialize_data_t *var_hash TSRMLS_DC
#define UNSERIALIZE_PASSTHRU rval, p, max, var_hash TSRMLS_CC
-static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, long elements)
+static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, long elements, int objprops)
{
while (elements-- > 0) {
zval *key, *data, **old_data;
@@ -297,7 +297,8 @@
return 0;
}
- switch (Z_TYPE_P(key)) {
+ if (!objprops) {
+ switch (Z_TYPE_P(key)) {
case IS_LONG:
if (zend_hash_index_find(ht, Z_LVAL_P(key), (void **)&old_data)==SUCCESS) {
var_push_dtor(var_hash, old_data);
@@ -310,6 +311,12 @@
}
zend_symtable_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data, sizeof(data), NULL);
break;
+ }
+ } else {
+ /* object properties should include no integers */
+ convert_to_string(key);
+ zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data,
+ sizeof data, NULL);
}
zval_dtor(key);
@@ -377,7 +384,7 @@
zval *retval_ptr = NULL;
zval fname;
- if (!process_nested_data(UNSERIALIZE_PASSTHRU, Z_OBJPROP_PP(rval), elements)) {
+ if (!process_nested_data(UNSERIALIZE_PASSTHRU, Z_OBJPROP_PP(rval), elements, 1)) {
return 0;
}
@@ -592,7 +599,7 @@
array_init_size(*rval, elements);
- if (!process_nested_data(UNSERIALIZE_PASSTHRU, Z_ARRVAL_PP(rval), elements)) {
+ if (!process_nested_data(UNSERIALIZE_PASSTHRU, Z_ARRVAL_PP(rval), elements, 0)) {
return 0;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
