diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2020-01-31 10:34:28 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2020-01-31 10:34:28 +0300 |
| commit | 7ebf1d44ed0433dc87c68a9c9ff64db9eca66e7a (patch) | |
| tree | bc891f2dc0666db33a9fc9f2950d3d9372e405fe /Zend/zend_vm_execute.h | |
| parent | 176ec97a16e2266eee25e7d4fae25cc28c07972b (diff) | |
| parent | db7193f31ea9d176214fc36cde0503864a75ab0d (diff) | |
| download | php-git-7ebf1d44ed0433dc87c68a9c9ff64db9eca66e7a.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #79094 (Crashing when running recursion function)
Diffstat (limited to 'Zend/zend_vm_execute.h')
| -rw-r--r-- | Zend/zend_vm_execute.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index a30b8ed469..5b5b4343f7 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -2860,7 +2860,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME } CACHE_PTR(opline->result.num, fbc); } - call = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, + call = _zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, fbc, opline->extended_value, NULL); call->prev_execute_data = EX(call); EX(call) = call; @@ -2947,7 +2947,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_NS_FCALL_BY_N CACHE_PTR(opline->result.num, fbc); } - call = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, + call = _zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, fbc, opline->extended_value, NULL); call->prev_execute_data = EX(call); EX(call) = call; @@ -2977,7 +2977,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_FCALL_SPEC_CO CACHE_PTR(opline->result.num, fbc); } - call = zend_vm_stack_push_call_frame_ex( + call = _zend_vm_stack_push_call_frame_ex( opline->op1.num, ZEND_CALL_NESTED_FUNCTION, fbc, opline->extended_value, NULL); call->prev_execute_data = EX(call); |