com php-src: fix standard object handler for properties when type == BP_VAR_IS: Zend/zend_object_handlers.c
| From: | Joe Watkins | Date: | Sat, 26 Mar 2016 10:43:56 +0000 |
| Subject: | com php-src: fix standard object handler for properties when type == BP_VAR_IS: Zend/zend_object_handlers.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-91487@lists.php.net to get a copy of this message | ||
Commit: 6f2895642807ca0b5667e21f3fa9b99af58ceb13
Author: Joe Watkins <krakjoe@php.net> Sat, 26 Mar 2016 10:43:56 +0000
Parents: d3ed75b9ebc998b8cf325e0e3ab954bd10989918
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6f2895642807ca0b5667e21f3fa9b99af58ceb13
Log:
fix standard object handler for properties when type == BP_VAR_IS
Changed paths:
M Zend/zend_object_handlers.c
Diff:
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index 7b31fdc..9abe387 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -552,6 +552,31 @@ zval *zend_std_read_property(zval *object, zval *member, int type, void
**cache_
goto exit;
}
+ /* magic isset */
+ if ((type == BP_VAR_IS) && zobj->ce->__isset) {
+ zval tmp_object, tmp_result;
+ zend_long *guard = zend_get_property_guard(zobj, Z_STR_P(member));
+
+ if (!((*guard) & IN_ISSET)) {
+ ZVAL_COPY(&tmp_object, object);
+ ZVAL_UNDEF(&tmp_result);
+
+ *guard |= IN_ISSET;
+ zend_std_call_issetter(&tmp_object, member, &tmp_result);
+ *guard &= ~IN_ISSET;
+
+ if (!zend_is_true(&tmp_result)) {
+ retval = &EG(uninitialized_zval);
+ zval_ptr_dtor(&tmp_object);
+ zval_ptr_dtor(&tmp_result);
+ goto exit;
+ }
+
+ zval_ptr_dtor(&tmp_object);
+ zval_ptr_dtor(&tmp_result);
+ }
+ }
+
/* magic get */
if (zobj->ce->__get) {
zend_long *guard = zend_get_property_guard(zobj, Z_STR_P(member));