Fixed Bug #63614 (Fatal error on Reflection)

laruence · laruence · commit df3b9a1e0791 · 2012-11-27T13:34:36.000+08:00
diff --git a/NEWS b/NEWS
@@ -7,17 +7,24 @@ PHP                                                                        NEWS
     from value). (Pierrick)
   . Fixed bug #63468 (wrong called method as callback with inheritance).
     (Laruence)
+
 - Core:
   . Fixed bug #63451 (config.guess file does not have AIX 7 defined, 
     shared objects are not created). (kemcline at au1 dot ibm dot com)
+
 - Apache2 Handler SAPI:
   . Enabled Apache 2.4 configure option for Windows (Pierre, Anatoliy)
+
 - Fileinfo:
   . Fixed bug #63248 (Load multiple magic files from a directory under Windows).
     (Anatoliy)
+
 - Imap:
   . Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores array (Remi)
 
+- Reflection:
+  . Fixed Bug #63614 (Fatal error on Reflection). (Laruence)
+
 
 22 Nov 2012, PHP 5.3.19
 
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
@@ -1733,7 +1733,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
@@ -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
+        )
+
+)

Original file line number	Diff line number	Diff line change
`@@ -1733,7 +1733,7 @@ ZEND_METHOD(reflection_function, getStaticVariables)`
`1733`	`1733`	`/* Return an empty array in case no static variables exist */`
`1734`	`1734`	`array_init(return_value);`
`1735`	`1735`	`if (fptr->type == ZEND_USER_FUNCTION && fptr->op_array.static_variables != NULL) {`
`1736`		`- zend_hash_apply_with_argument(fptr->op_array.static_variables, (apply_func_arg_t) zval_update_constant, (void*)1 TSRMLS_CC);`
	`1736`	`+ zend_hash_apply_with_argument(fptr->op_array.static_variables, (apply_func_arg_t) zval_update_constant_inline_change, fptr->common.scope TSRMLS_CC);`
`1737`	`1737`	`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 ));`
`1738`	`1738`	`}`
`1739`	`1739`	`}`