Fixed execution with overriden zend_execute_ex()

11 years ago · 796b633817
2 changed files with 2 additions and 2 deletions
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@ -7674,7 +7674,7 @@ ZEND_VM_HANDLER(158, ZEND_CALL_TRAMPOLINE, ANY, ANY)
 ZEND_VM_C_LABEL(call_trampoline_end):
 	execute_data = EG(current_execute_data);

-	if (!EX(func) || !ZEND_USER_CODE(EX(func)->type)) {
+	if (!EX(func) || !ZEND_USER_CODE(EX(func)->type) || (call_kind & ZEND_CALL_TOP)) {
 		ZEND_VM_RETURN();
 	}

--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@ -1888,7 +1888,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CALL_TRAMPOLINE_SPEC_HANDLER(Z
 call_trampoline_end:
 	execute_data = EG(current_execute_data);

-	if (!EX(func) || !ZEND_USER_CODE(EX(func)->type)) {
+	if (!EX(func) || !ZEND_USER_CODE(EX(func)->type) || (call_kind & ZEND_CALL_TOP)) {
 		ZEND_VM_RETURN();
 	}