[php-src] PHP-8.4: Fix GH-23980: ZEND_ASSERT violation @ ZEND_INCLUDE_OR_EVAL (include/eval run with a pending exception)
| From: | ndossche | Date: | Tue, 29 Sep 2026 19:44:49 +0000 |
| Subject: | [php-src] PHP-8.4: Fix GH-23980: ZEND_ASSERT violation @ ZEND_INCLUDE_OR_EVAL (include/eval run with a pending exception) | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-141729@lists.php.net to get a copy of this message | ||
Author: ndossche (ndossche)
Date: 2026-09-29T21:43:36+02:00
Commit: https://github.com/php/php-src/commit/e7b225697ef2251e3ecfdd21984489c633f94101
Raw diff: https://github.com/php/php-src/commit/e7b225697ef2251e3ecfdd21984489c633f94101.diff
Fix GH-23980: ZEND_ASSERT violation @ ZEND_INCLUDE_OR_EVAL (include/eval run with a pending
exception)
Closes GH-24002.
Changed paths:
M NEWS
M Zend/zend_vm_def.h
M Zend/zend_vm_execute.h
Diff:
diff --git a/NEWS b/NEWS
index 0ec3c10f0a12..dbb54c4cbaa9 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,7 @@ PHP NEWS
(ndossche)
. Fixed AVX being reported as supported when the OS has not enabled AVX
state. (Ilia Alshanetsky)
+ . Fixed GH-23980 (ZEND_ASSERT violation @ ZEND_INCLUDE_OR_EVAL). (ndossche)
- DOM:
. Fixed use-after-free when re-constructing a DOMXPath whose php:function
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index c46b17101546..566c9b4c4563 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -6585,7 +6585,11 @@ ZEND_VM_HANDLER(73, ZEND_INCLUDE_OR_EVAL, CONST|TMPVAR|CV, ANY, EVAL,
SPEC(OBSER
}
}
FREE_OP1();
- ZEND_VM_NEXT_OPCODE();
+ if (OP1_TYPE & IS_CONST) {
+ ZEND_VM_NEXT_OPCODE();
+ } else {
+ ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
+ }
}
ZEND_VM_HANDLER(153, ZEND_UNSET_CV, CV, UNUSED)
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index f4f35ce2a8a9..2ebbfaa9c05d 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -5306,7 +5306,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_INCLUDE_OR_EVAL_SPEC_CONST_HAN
}
}
- ZEND_VM_NEXT_OPCODE();
+ if (IS_CONST & IS_CONST) {
+ ZEND_VM_NEXT_OPCODE();
+ } else {
+ ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
+ }
}
static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_INCLUDE_OR_EVAL_SPEC_OBSERVER_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
@@ -5389,7 +5393,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_INCLUDE_OR_EVAL_SPEC_OBSERVER_
}
}
FREE_OP(opline->op1_type, opline->op1.var);
- ZEND_VM_NEXT_OPCODE();
+ if (opline->op1_type & IS_CONST) {
+ ZEND_VM_NEXT_OPCODE();
+ } else {
+ ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
+ }
}
static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_FE_RESET_R_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
@@ -15394,7 +15402,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_INCLUDE_OR_EVAL_SPEC_TMPVAR_HA
}
}
zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
- ZEND_VM_NEXT_OPCODE();
+ if ((IS_TMP_VAR|IS_VAR) & IS_CONST) {
+ ZEND_VM_NEXT_OPCODE();
+ } else {
+ ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
+ }
}
static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_YIELD_FROM_SPEC_TMPVAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
@@ -41213,7 +41225,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_INCLUDE_OR_EVAL_SPEC_CV_HANDLE
}
}
- ZEND_VM_NEXT_OPCODE();
+ if (IS_CV & IS_CONST) {
+ ZEND_VM_NEXT_OPCODE();
+ } else {
+ ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
+ }
}
static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_FE_RESET_R_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)