php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.2'

Browse Source 
* PHP-8.2:
  Fixed incorrect VM stack overflow checks elimination
This commit is contained in:
Dmitry Stogov
2023-06-20 12:00:32 +03:00
parent 443927e3e8 e50ed0f1a2
commit 1949151935
2 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/opcache/jit/zend_jit_internal.h
View File

@@ -602,6 +602,8 @@ struct _zend_jit_trace_stack_frame {
uint32_t call_level;
uint32_t _info;
int used_stack;
int old_checked_stack;
int old_peek_checked_stack;
zend_jit_trace_stack stack[1];
};

29
ext/opcache/jit/zend_jit_trace.c
View File

@@ -6591,7 +6591,8 @@ done:
op_array_ssa = &jit_extension->func_info.ssa;
top = frame;
if (frame->prev) {
checked_stack -= frame->used_stack;
checked_stack = frame->old_checked_stack;
peek_checked_stack = frame->old_peek_checked_stack;
frame = frame->prev;
stack = frame->stack;
ZEND_ASSERT(&frame->func->op_array == op_array);
@@ -6764,24 +6765,40 @@ done:
}
}
}
call->old_checked_stack = checked_stack;
call->old_peek_checked_stack = peek_checked_stack;
if (p->info & ZEND_JIT_TRACE_FAKE_INIT_CALL) {
frame->call_level++;
call->used_stack = 0;
call->used_stack = checked_stack = peek_checked_stack = 0;
} else {
if (p->func) {
call->used_stack = zend_vm_calc_used_stack(init_opline->extended_value, (zend_function*)p->func);
} else {
call->used_stack = (ZEND_CALL_FRAME_SLOT + init_opline->extended_value) * sizeof(zval);
}
checked_stack += call->used_stack;
if (checked_stack > peek_checked_stack) {
peek_checked_stack = checked_stack;
switch (init_opline->opcode) {
case ZEND_INIT_FCALL:
case ZEND_INIT_FCALL_BY_NAME:
case ZEND_INIT_NS_FCALL_BY_NAME:
case ZEND_INIT_METHOD_CALL:
case ZEND_INIT_DYNAMIC_CALL:
//case ZEND_INIT_STATIC_METHOD_CALL:
//case ZEND_INIT_USER_CALL:
//case ZEND_NEW:
checked_stack += call->used_stack;
if (checked_stack > peek_checked_stack) {
peek_checked_stack = checked_stack;
}
break;
default:
checked_stack = peek_checked_stack = 0;
}
}
} else if (p->op == ZEND_JIT_TRACE_DO_ICALL) {
call = frame->call;
if (call) {
checked_stack -= call->used_stack;
checked_stack = call->old_checked_stack;
peek_checked_stack = call->old_peek_checked_stack;
top = call;
frame->call = call->prev;
}