diff options
| -rw-r--r-- | Zend/tests/bug78921.phpt | 36 | ||||
| -rw-r--r-- | Zend/zend_execute_API.c | 4 |
2 files changed, 40 insertions, 0 deletions
diff --git a/Zend/tests/bug78921.phpt b/Zend/tests/bug78921.phpt new file mode 100644 index 0000000000..a368788081 --- /dev/null +++ b/Zend/tests/bug78921.phpt @@ -0,0 +1,36 @@ +--TEST-- +Bug #78921: When Reflection triggers class load, property visibility is incorrect +--FILE-- +<?php + +spl_autoload_register(function($className) { + if ($className == 'PrivateStatic') { + class PrivateStatic + { + const SOME_CONST = 13; + private static $privateStaticVarArray = ['a', 'b', 'c']; + private static $otherStatic; + public static function init() + { + self::$otherStatic = self::$privateStaticVarArray; + } + } + PrivateStatic::init(); + } +}); + +class OtherClass +{ + const MY_CONST = PrivateStatic::SOME_CONST; + public static $prop = 'my property'; +} + +$reflectionClass = new ReflectionClass('OtherClass'); +$reflectionProperty = $reflectionClass->getProperty('prop'); +$reflectionProperty->setAccessible(true); +$value = $reflectionProperty->getValue(); +echo "Value is $value\n"; + +?> +--EXPECT-- +Value is my property diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 4551085675..de6af0e5d5 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -836,6 +836,7 @@ ZEND_API zend_class_entry *zend_lookup_class_ex(zend_string *name, zend_string * zend_string *lc_name; zend_fcall_info fcall_info; zend_fcall_info_cache fcall_cache; + zend_class_entry *orig_fake_scope; if (key) { lc_name = key; @@ -926,11 +927,14 @@ ZEND_API zend_class_entry *zend_lookup_class_ex(zend_string *name, zend_string * fcall_cache.called_scope = NULL; fcall_cache.object = NULL; + orig_fake_scope = EG(fake_scope); + EG(fake_scope) = NULL; zend_exception_save(); if ((zend_call_function(&fcall_info, &fcall_cache) == SUCCESS) && !EG(exception)) { ce = zend_hash_find_ptr(EG(class_table), lc_name); } zend_exception_restore(); + EG(fake_scope) = orig_fake_scope; zval_ptr_dtor(&args[0]); zval_ptr_dtor_str(&fcall_info.function_name); |