andrey Sat Aug 21 10:11:56 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src NEWS
/php-src/ext/standard var.c
/php-src/tests/classes bug26737.phpt
Log:
MFH (bug 26737)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.49&r2=1.1760.2.50&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.49 php-src/NEWS:1.1760.2.50
--- php-src/NEWS:1.1760.2.49 Fri Aug 20 02:13:41 2004
+++ php-src/NEWS Sat Aug 21 10:11:56 2004
@@ -14,6 +14,9 @@
(Christian, Rob)
- Fixed bug #29656 (segfault on result and statement properties). (Georg)
- Fixed bug #29447 (Reflection API issues). (Marcus)
+- Fixed bug #26737 (private/protected properties not serialized when user
+ declared method __sleep() exists). E_NOTICE thrown when __sleep() returns
+ name of non-existing member. (Andrey, Curt)
12 Aug 2004, PHP 5.0.1
- Changed destructor mechanism so that destructors are called prior to request
http://cvs.php.net/diff.php/php-src/ext/standard/var.c?r1=1.191&r2=1.191.2.1&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.191.2.1
--- php-src/ext/standard/var.c:1.191 Sun Jul 4 07:14:17 2004
+++ php-src/ext/standard/var.c Sat Aug 21 10:11:56 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var.c,v 1.191 2004/07/04 11:14:17 helly Exp $ */
+/* $Id: var.c,v 1.191.2.1 2004/08/21 14:11:56 andrey Exp $ */
/* {{{ includes
@@ -579,13 +579,40 @@
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);
+ }
}
}
}
http://cvs.php.net/diff.php/php-src/tests/classes/bug26737.phpt?r1=1.1.2.1&r2=1.1.2.2&ty=u
Index: php-src/tests/classes/bug26737.phpt
diff -u php-src/tests/classes/bug26737.phpt:1.1.2.1
php-src/tests/classes/bug26737.phpt:1.1.2.2
--- php-src/tests/classes/bug26737.phpt:1.1.2.1 Thu Jul 22 14:39:45 2004
+++ php-src/tests/classes/bug26737.phpt Sat Aug 21 10:11:56 2004
@@ -2,6 +2,7 @@
Bug #26737 (Protected and private variables are not saved on serialization when a
user defined __sleep is used)
--FILE--
<?php
+error_reporting(E_ALL);
class foo
{
private $private = 'private';
@@ -10,12 +11,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;}"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
