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' into PHP-8.3

Browse Source 
* PHP-8.2:
  Fix possible NULL dereference
This commit is contained in:
Dmitry Stogov
2024-09-26 15:44:05 +03:00
parent 70eb8f06ed 24d5912a30
commit 8b7f64fa41
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1251,7 +1251,8 @@ static zend_ssa *zend_jit_trace_build_tssa(zend_jit_trace_rec *trace_buffer, uin
}
} else if (p->op == ZEND_JIT_TRACE_DO_ICALL) {
if (JIT_G(opt_level) < ZEND_JIT_LEVEL_OPT_FUNC) {
if (p->func != (zend_function*)&zend_pass_function
if (p->func
&& p->func != (zend_function*)&zend_pass_function
&& (zend_string_equals_literal(p->func->common.function_name, "extract")
|| zend_string_equals_literal(p->func->common.function_name, "compact")
|| zend_string_equals_literal(p->func->common.function_name, "get_defined_vars"))) {
@@ -6225,7 +6226,7 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
goto jit_failure;
}
if ((p+1)->op == ZEND_JIT_TRACE_INIT_CALL && (p+1)->func) {
if (opline->opcode == ZEND_NEW && ssa_op->result_def >= 0) {
if (opline->opcode == ZEND_NEW && opline->result_type != IS_UNUSED) {
SET_STACK_TYPE(stack, EX_VAR_TO_NUM(opline->result.var), IS_OBJECT, 1);
}
if (zend_jit_may_be_polymorphic_call(opline) ||