diff options
| author | Felipe Pena <felipe@php.net> | 2009-05-12 22:55:05 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2009-05-12 22:55:05 +0000 |
| commit | db1eafa8d08f66d7e73ee132ef6e21e3bb747845 (patch) | |
| tree | 4dffbc11b32edef2c198333566d98181521b82e4 /Zend/zend_object_handlers.c | |
| parent | 3fb4089ba71dfe6f30994b222ca056d2db929cfa (diff) | |
| download | php-git-db1eafa8d08f66d7e73ee132ef6e21e3bb747845.tar.gz | |
- MFH: Fixed bug #48248 (SIGSEGV when access to private property via &__get)
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); |