Skip to content

Commit 459f8cb

Browse files
committed
VM: Also exclude CV for exception check in include_or_eval
Follow-up for e7b2256
1 parent 56afe82 commit 459f8cb

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

‎Zend/zend_vm_def.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6684,7 +6684,7 @@ ZEND_VM_HANDLER(73, ZEND_INCLUDE_OR_EVAL, CONST|TMP|CV, ANY, EVAL, SPEC(OBSERVER
66846684
}
66856685
}
66866686
FREE_OP1();
6687-
if (OP1_TYPE & IS_CONST) {
6687+
if (OP1_TYPE & (IS_CONST|IS_CV)) {
66886688
ZEND_VM_NEXT_OPCODE();
66896689
} else {
66906690
ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();

‎Zend/zend_vm_execute.h‎

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)