Set the correct function state during execution. This is mainly to have

get_active_function_name() to return proper value.

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 53bd1ab958e3ea073e2c26f2545d2e86be0611fa..0e3b4eb4c0829b37e8280972826cc2cb1a31d19a 100644 (file)
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -417,6 +417,8 @@ int call_user_function_ex(HashTable *function_table, zval **object_pp, zval *fun
 
        zend_ptr_stack_n_push(&EG(argument_stack), 2, (void *) (long) param_count, NULL);
 
+       EG(function_state_ptr) = &function_state;
+
        if (function_state.function->type == ZEND_USER_FUNCTION) {
                calling_symbol_table = EG(active_symbol_table);
                if (symbol_table) {