andrey Sat Aug 21 09:49:19 2004 EDT
Modified files:
/php-src/tests/classes bug26737.phpt
/php-src/ext/standard var.c
Log:
fix for bug 26737 : private & protected member variables not serialized
when user defined __sleep() is declared. Additionally E_NOTICE is
being thrown if __sleep() returns a non-existing member variable name
http://cvs.php.net/diff.php/php-src/tests/classes/bug26737.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/tests/classes/bug26737.phpt
diff -u php-src/tests/classes/bug26737.phpt:1.2 php-src/tests/classes/bug26737.phpt:1.3
--- php-src/tests/classes/bug26737.phpt:1.2 Thu Jul 22 14:40:19 2004
+++ php-src/tests/classes/bug26737.phpt Sat Aug 21 09:49:19 2004
@@ -10,12 +10,13 @@
public function __sleep()
{
- return array('private', 'protected', 'public');
+ return array('private', 'protected', 'public', 'no_such');
}
}
$foo = new foo();
$data = serialize($foo);
var_dump(str_replace("\0", '\0', $data));
?>
---EXPECT--
-string(76)
"O:3:"foo":3:{s:7:"private";N;s:9:"protected";R:2;s:6:"public";s:6:"public";}"
+--EXPECTF--
+Notice: serialize(): "no_such" returned as member variable from __sleep() but does
not exist in %s on line %d
+string(130)
"O:3:"foo":4:{s:12:"\0foo\0private";s:7:"private";s:12:"\0*\0protected";s:9:"protected";s:6:"public";s:6:"public";s:7:"no_such";N;}"
http://cvs.php.net/diff.php/php-src/ext/standard/var.c?r1=1.191&r2=1.192&ty=u
Index: php-src/ext/standard/var.c
diff -u php-src/ext/standard/var.c:1.191 php-src/ext/standard/var.c:1.192
--- php-src/ext/standard/var.c:1.191 Sun Jul 4 07:14:17 2004
+++ php-src/ext/standard/var.c Sat Aug 21 09:49:19 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var.c,v 1.191 2004/07/04 11:14:17 helly Exp $ */
+/* $Id: var.c,v 1.192 2004/08/21 13:49:19 andrey Exp $ */
/* {{{ includes
@@ -578,14 +578,40 @@
smart_str_appendl(buf,"N;", 2);
continue;
}
-
- php_var_serialize_string(buf, Z_STRVAL_PP(name),
Z_STRLEN_PP(name));
-
if (zend_hash_find(Z_OBJPROP_PP(struc), Z_STRVAL_PP(name),
Z_STRLEN_PP(name) + 1, (void *) &d) ==
SUCCESS) {
- php_var_serialize_intern(buf, d, var_hash TSRMLS_CC);
+ php_var_serialize_string(buf, Z_STRVAL_PP(name),
Z_STRLEN_PP(name));
+ php_var_serialize_intern(buf, d, var_hash TSRMLS_CC);
} else {
- php_var_serialize_intern(buf, &nvalp, var_hash
TSRMLS_CC);
+ zend_class_entry *ce;
+ ce = zend_get_class_entry(*struc TSRMLS_CC);
+ if (ce) {
+ char *prot_name, *priv_name;
+ int prop_name_length;
+
+ do {
+ zend_mangle_property_name(&priv_name,
&prop_name_length, ce->name, ce->name_length,
+
Z_STRVAL_PP(name), Z_STRLEN_PP(name) + 1, ce->type & ZEND_INTERNAL_CLASS);
+ if
(zend_hash_find(Z_OBJPROP_PP(struc), priv_name, prop_name_length, (void *) &d) ==
SUCCESS) {
+ php_var_serialize_string(buf,
priv_name, prop_name_length-1);
+ php_var_serialize_intern(buf,
d, var_hash TSRMLS_CC);
+ break;
+ }
+ zend_mangle_property_name(&prot_name,
&prop_name_length, "*", 1,
+
Z_STRVAL_PP(name), Z_STRLEN_PP(name) + 1, ce->type & ZEND_INTERNAL_CLASS);
+ if
(zend_hash_find(Z_OBJPROP_PP(struc), prot_name, prop_name_length, (void *) &d) ==
SUCCESS) {
+ php_var_serialize_string(buf,
prot_name, prop_name_length - 1);
+ php_var_serialize_intern(buf,
d, var_hash TSRMLS_CC);
+ break;
+ }
+ php_error_docref(NULL TSRMLS_CC,
E_NOTICE, "\"%s\" returned as member variable from __sleep() but does not exist",
Z_STRVAL_PP(name));
+ php_var_serialize_string(buf,
Z_STRVAL_PP(name), Z_STRLEN_PP(name));
+ php_var_serialize_intern(buf, &nvalp,
var_hash TSRMLS_CC);
+ } while (0);
+ } else {
+ php_var_serialize_string(buf,
Z_STRVAL_PP(name), Z_STRLEN_PP(name));
+ php_var_serialize_intern(buf, &nvalp, var_hash
TSRMLS_CC);
+ }
}
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
