com php-src: Fix issue with zend_execute_ex replaced by execute_ex upon icall: sapi/phpdbg/phpdbg_prompt .c
| From: | Bob Weinand | Date: | Tue, 16 Jun 2015 21:37:39 +0000 |
| Subject: | com php-src: Fix issue with zend_execute_ex replaced by execute_ex upon icall: sapi/phpdbg/phpdbg_prompt .c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87300@lists.php.net to get a copy of this message | ||
Commit: 28756e99be2b6701e8a781ee54c1e1aeaa039813
Author: Bob Weinand <bobwei9@hotmail.com> Tue, 16 Jun 2015 23:37:23 +0200
Parents: 8c4807fe7a78d9a7e73b3943cac0647df641eb2d
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=28756e99be2b6701e8a781ee54c1e1aeaa039813
Log:
Fix issue with zend_execute_ex replaced by execute_ex upon icall
Changed paths:
M sapi/phpdbg/phpdbg_prompt.c
Diff:
diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c
index 173c3f6..146532f 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);