diff options
Diffstat (limited to 'Zend/zend_object_handlers.c')
| -rw-r--r-- | Zend/zend_object_handlers.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index 7050dfeca9..e04bcb1447 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -578,8 +578,8 @@ static zval **zend_std_get_property_ptr_ptr(zval *object, zval *member TSRMLS_DC zend_guard *guard; if (!zobj->ce->__get || - zend_get_property_guard(zobj, property_info, member, &guard) != SUCCESS || - guard->in_get) { + zend_get_property_guard(zobj, property_info, member, &guard) != SUCCESS || + (property_info && guard->in_get)) { /* we don't have access controls - will just add it */ new_zval = &EG(uninitialized_zval); |