-
Notifications
You must be signed in to change notification settings - Fork 8k
Fix compiler segfault during call compilation #20054
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3956,19 +3956,21 @@ static bool zend_compile_call_common(znode *result, zend_ast *args_ast, zend_fun | |
| if (args_ast->kind == ZEND_AST_CALLABLE_CONVERT) { | ||
| opline = &CG(active_op_array)->opcodes[opnum_init]; | ||
| opline->extended_value = 0; | ||
| /* opcode array may be reallocated, so don't access opcode field after zend_emit_op_tmp(). */ | ||
| uint8_t opcode = opline->opcode; | ||
|
|
||
| if (opline->opcode == ZEND_NEW) { | ||
| if (opcode == ZEND_NEW) { | ||
| zend_error_noreturn(E_COMPILE_ERROR, "Cannot create Closure for new expression"); | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: non-PR touched code has wrong indent in this line There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Huh indeed. Good find. I'll fix it separately. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Fixed via f9c4fe4 |
||
| } | ||
|
|
||
| if (opline->opcode == ZEND_INIT_FCALL) { | ||
| if (opcode == ZEND_INIT_FCALL) { | ||
| opline->op1.num = zend_vm_calc_used_stack(0, fbc); | ||
| } | ||
|
|
||
| zend_op *callable_convert_op = zend_emit_op_tmp(result, ZEND_CALLABLE_CONVERT, NULL, NULL); | ||
| if (opline->opcode == ZEND_INIT_FCALL | ||
| || opline->opcode == ZEND_INIT_FCALL_BY_NAME | ||
| || opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME) { | ||
| if (opcode == ZEND_INIT_FCALL | ||
| || opcode == ZEND_INIT_FCALL_BY_NAME | ||
| || opcode == ZEND_INIT_NS_FCALL_BY_NAME) { | ||
| callable_convert_op->extended_value = zend_alloc_cache_slot(); | ||
| } else { | ||
| callable_convert_op->extended_value = (uint32_t)-1; | ||
|
|
||