From: Andi Gutmans <andi@php.net>
Date: Mon, 11 Oct 1999 20:29:55 +0000 (+0000)
Subject: - No idea why this bug didn't exist before. But I'm too tired to think of it.
X-Git-Tag: php-4.0b3_RC2~209
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=81aa9a36b613b5dc4aaae357b204b9ee3cb85812;p=php

- 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 :)
---

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;