diff options
| author | Xinchen Hui <laruence@php.net> | 2012-11-27 13:35:41 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-11-27 13:36:38 +0800 |
| commit | 070239a19447c2737bc4fddbcce00c2e16f362d0 (patch) | |
| tree | 3b5e5f80e919f942b0bc996b13d79ef6920af6e7 | |
| parent | 7751a6882485de64365661f4e7918535c3992982 (diff) | |
| parent | df3b9a1e0791803b1d9f9300d8f36dd981126bc7 (diff) | |
| download | php-git-070239a19447c2737bc4fddbcce00c2e16f362d0.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/reflection/php_reflection.c | 2 | ||||
| -rw-r--r-- | ext/reflection/tests/bug63614.phpt | 41 |
3 files changed, 45 insertions, 1 deletions
@@ -23,6 +23,9 @@ PHP NEWS - Apache2 Handler SAPI: . Enabled Apache 2.4 configure option for Windows (Pierre, Anatoliy) +- Reflection: + . Fixed Bug #63614 (Fatal error on Reflection). (Laruence) + 22 Nov 2012, PHP 5.4.9 - Core: diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 53b2389d63..60f1e547a6 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -1884,7 +1884,7 @@ ZEND_METHOD(reflection_function, getStaticVariables) /* Return an empty array in case no static variables exist */ array_init(return_value); if (fptr->type == ZEND_USER_FUNCTION && fptr->op_array.static_variables != NULL) { - zend_hash_apply_with_argument(fptr->op_array.static_variables, (apply_func_arg_t) zval_update_constant, (void*)1 TSRMLS_CC); + zend_hash_apply_with_argument(fptr->op_array.static_variables, (apply_func_arg_t) zval_update_constant_inline_change, fptr->common.scope TSRMLS_CC); zend_hash_copy(Z_ARRVAL_P(return_value), fptr->op_array.static_variables, (copy_ctor_func_t) zval_add_ref, (void *) &tmp_copy, sizeof(zval *)); } } diff --git a/ext/reflection/tests/bug63614.phpt b/ext/reflection/tests/bug63614.phpt new file mode 100644 index 0000000000..c13ff4b20e --- /dev/null +++ b/ext/reflection/tests/bug63614.phpt @@ -0,0 +1,41 @@ +--TEST-- +Bug #63614 (Fatal error on Reflection) +--FILE-- +<?php +function dummy() { + static $a = array(); +} + +class Test +{ + const A = 0; + + public function func() + { + static $a = array( + self::A => 'a' + ); + } +} + +$reflect = new ReflectionFunction("dummy"); +print_r($reflect->getStaticVariables()); +$reflect = new ReflectionMethod('Test', 'func'); +print_r($reflect->getStaticVariables()); +?> +--EXPECT-- +Array +( + [a] => Array + ( + ) + +) +Array +( + [a] => Array + ( + [0] => a + ) + +) |