Skip to content

Commit 5bfc160

Browse files
committed
Don't shortcut empty oparray executions if zend_execute_ex has been overridden
1 parent 6b6e5f3 commit 5bfc160

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

Zend/zend_vm_def.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -6281,7 +6281,8 @@ ZEND_VM_HANDLER(73, ZEND_INCLUDE_OR_EVAL, CONST|TMPVAR|CV, ANY, EVAL, SPEC(OBSER
62816281
}
62826282
} else if (new_op_array->last == 1
62836283
&& new_op_array->opcodes[0].opcode == ZEND_RETURN
6284-
&& new_op_array->opcodes[0].op1_type == IS_CONST) {
6284+
&& new_op_array->opcodes[0].op1_type == IS_CONST
6285+
&& EXPECTED(zend_execute_ex == execute_ex)) {
62856286
if (RETURN_VALUE_USED(opline)) {
62866287
const zend_op *op = new_op_array->opcodes;
62876288

Zend/zend_vm_execute.h

+8-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)