com php-src: Fix foreach/get_object_vars for shadowed properties: Zend/tests/foreach_shadowed_property.p hpt Zend/zend_object_handlers.c
| From: | Nikita Popov | Date: | Wed, 10 Oct 2018 21:18:34 +0000 |
| Subject: | com php-src: Fix foreach/get_object_vars for shadowed properties: Zend/tests/foreach_shadowed_property.p hpt Zend/zend_object_handlers.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-103428@lists.php.net to get a copy of this message | ||
Commit: 4d5d77904e9e4dc52236ec5416d1ddfef9b3911c
Author: Nikita Popov <nikita.ppv@gmail.com> Wed, 10 Oct 2018 23:18:34 +0200
Parents: 76c8d79df6e6de23eb97e81adde2d3c2b97fd7a8
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4d5d77904e9e4dc52236ec5416d1ddfef9b3911c
Log:
Fix foreach/get_object_vars for shadowed properties
If we are in a scope where the shadowed private property is
visible, the shadowing public property should not be visible.
Changed paths:
A Zend/tests/foreach_shadowed_property.phpt
M Zend/zend_object_handlers.c
Diff:
diff --git a/Zend/tests/foreach_shadowed_property.phpt b/Zend/tests/foreach_shadowed_property.phpt
new file mode 100644
index 0000000..7fb2014
--- /dev/null
+++ b/Zend/tests/foreach_shadowed_property.phpt
@@ -0,0 +1,28 @@
+--TEST--
+Foreach over object with shadowed private property
+--FILE--
+<?php
+
+class Test {
+ private $prop = "Test";
+
+ function run() {
+ foreach ($this as $k => $v) {
+ echo "$k => $v\n";
+ }
+ var_dump(get_object_vars($this));
+ }
+}
+class Test2 extends Test {
+ public $prop = "Test2";
+}
+
+(new Test2)->run();
+
+?>
+--EXPECT--
+prop => Test
+array(1) {
+ ["prop"]=>
+ string(4) "Test"
+}
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index 6773f99..ccc4ebe 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -558,6 +558,7 @@ ZEND_API int zend_check_property_access(zend_object *zobj, zend_string *prop_inf
} else {
ZEND_ASSERT(property_info->flags & ZEND_ACC_PROTECTED);
}
+ return SUCCESS;
} else {
property_info = zend_get_property_info(zobj->ce, prop_info_name, 1);
if (property_info == NULL) {
@@ -565,9 +566,8 @@ ZEND_API int zend_check_property_access(zend_object *zobj, zend_string *prop_inf
} else if (property_info == ZEND_WRONG_PROPERTY_INFO) {
return FAILURE;
}
- ZEND_ASSERT(property_info->flags & ZEND_ACC_PUBLIC);
+ return (property_info->flags & ZEND_ACC_PUBLIC) ? SUCCESS : FAILURE;
}
- return SUCCESS;
}
/* }}} */