Commit 459f8cb22bb for php
commit 459f8cb22bb795f620f1d6fdfbba374c6520ea03
Author: ndossche <7771979+ndossche@users.noreply.github.com>
Date: Sat Oct 3 00:19:09 2026 +0200
VM: Also exclude CV for exception check in include_or_eval
Follow-up for e7b225697ef2251e3ecfdd21984489c633f94101
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index efa05df6aa6..19fa358cb54 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -6684,7 +6684,7 @@ ZEND_VM_HANDLER(73, ZEND_INCLUDE_OR_EVAL, CONST|TMP|CV, ANY, EVAL, SPEC(OBSERVER
}
}
FREE_OP1();
- if (OP1_TYPE & IS_CONST) {
+ if (OP1_TYPE & (IS_CONST|IS_CV)) {
ZEND_VM_NEXT_OPCODE();
} else {
ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 243716bfe87..1b30ad218f2 100644
Binary files a/Zend/zend_vm_execute.h and b/Zend/zend_vm_execute.h differ