From: Bob Weinand <bobwei9@hotmail.com>
Date: Tue, 16 Jun 2015 21:37:23 +0000 (+0200)
Subject: Fix issue with zend_execute_ex replaced by execute_ex upon icall
X-Git-Tag: php-7.0.0alpha2~2^2~106
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=28756e99be2b6701e8a781ee54c1e1aeaa039813;p=php

Fix issue with zend_execute_ex replaced by execute_ex upon icall
---

diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c
index 173c3f60d8..146532f81e 100644
--- a/sapi/phpdbg/phpdbg_prompt.c
+++ b/sapi/phpdbg/phpdbg_prompt.c
@@ -1559,7 +1559,7 @@ next:
 		if ((execute_data->opline->opcode == ZEND_DO_FCALL ||
 		     execute_data->opline->opcode == ZEND_DO_UCALL ||
 		     execute_data->opline->opcode == ZEND_DO_FCALL_BY_NAME) &&
-		    execute_data->func->type == ZEND_USER_FUNCTION) {
+		     execute_data->call->func->type == ZEND_USER_FUNCTION) {
 			zend_execute_ex = execute_ex;
 		}
 		PHPDBG_G(vmret) = zend_vm_call_opcode_handler(execute_data);