diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-01-13 17:08:52 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-01-13 17:08:52 -0800 |
| commit | 1a96fe0b3260b4b63627cf69d71a5b350ad3163f (patch) | |
| tree | 32b1fc2cef2f94f0cc6412cbd71a210a67d78b7d /Zend | |
| parent | c6203da6c26439ed698193f71e3983be74a4545b (diff) | |
| download | php-git-1a96fe0b3260b4b63627cf69d71a5b350ad3163f.tar.gz | |
fix bug #63982: isset() inconsistently produces a fatal error on protected property
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/tests/bug63982.phpt | 15 | ||||
| -rw-r--r-- | Zend/zend_object_handlers.c | 2 |
2 files changed, 16 insertions, 1 deletions
diff --git a/Zend/tests/bug63982.phpt b/Zend/tests/bug63982.phpt new file mode 100644 index 0000000000..31294f33e8 --- /dev/null +++ b/Zend/tests/bug63982.phpt @@ -0,0 +1,15 @@ +--TEST-- +Bug #63982 (isset() inconsistently produces a fatal error on protected property) +--FILE-- +<?php +class Test { + protected $protectedProperty; +} + +$test = new Test(); + +var_dump(isset($test->protectedProperty)); +var_dump(isset($test->protectedProperty->foo)); +--EXPECTF-- +bool(false) +bool(false) diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index 3881c0e870..2c2a45d726 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -435,7 +435,7 @@ zval *zend_std_read_property(zval *object, zval *member, int type, const zend_li #endif /* make zend_get_property_info silent if we have getter - we may want to use it */ - property_info = zend_get_property_info_quick(zobj->ce, member, (zobj->ce->__get != NULL), key TSRMLS_CC); + property_info = zend_get_property_info_quick(zobj->ce, member, silent || (zobj->ce->__get != NULL), key TSRMLS_CC); if (UNEXPECTED(!property_info) || ((EXPECTED((property_info->flags & ZEND_ACC_STATIC) == 0) && |