diff options
| author | Andi Gutmans <andi@php.net> | 1999-10-11 20:29:55 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 1999-10-11 20:29:55 +0000 |
| commit | 81aa9a36b613b5dc4aaae357b204b9ee3cb85812 (patch) | |
| tree | 9765200475c7a0970fee194eb220ed69b06954fd | |
| parent | cab346f50c855e3370974935bcb0fa1afafad467 (diff) | |
| download | php-git-81aa9a36b613b5dc4aaae357b204b9ee3cb85812.tar.gz | |
- No idea why this bug didn't exist before. But I'm too tired to think of it.
During a regular do_fcall we need to set object.ptr to NULL and, thus,
push it in the beginning and pop it in the end.
I hope this fix more or less cuts it. I just want to sleep :)
| -rw-r--r-- | Zend/zend_execute.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 97861d0299..d26181a7d2 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -1454,6 +1454,8 @@ overloaded_function_call_cont: zend_error(E_ERROR, "Unknown function: %s()\n", fname->value.str.val); } FREE_OP(&opline->op1, EG(free_op1)); + zend_ptr_stack_push(&EG(arg_types_stack), object.ptr); + object.ptr = NULL; goto do_fcall_common; } do_fcall_common: @@ -1514,6 +1516,8 @@ do_fcall_common: } if (opline->opcode == ZEND_DO_FCALL_BY_NAME) { zend_ptr_stack_n_pop(&EG(arg_types_stack), 2, &object.ptr, &function_being_called); + } else if (opline->opcode == ZEND_DO_FCALL) { + object.ptr = zend_ptr_stack_pop(&EG(arg_types_stack)); } function_state.function = (zend_function *) op_array; EG(function_state_ptr) = &function_state; |