Commit e00eb09ed7c for php
commit e00eb09ed7c02f6d092507bfc1abda98b275f738
Author: Ilija Tovilo <ilija.tovilo@me.com>
Date: Wed Nov 18 17:11:12 2026 +0100
Revert "Zend: delayed OOM clears the opline of a frame mid-op."
This reverts commit 2f16c49a16159cbfde341cfc404bf49b7c402db4.
diff --git a/NEWS b/NEWS
index 5a7dd2c3017..974c95c1d22 100644
--- a/NEWS
+++ b/NEWS
@@ -91,8 +91,6 @@ PHP NEWS
(pavimus)
. Fixed opcache.enable_file_override lookups racing with OPcache restarts
(pavimus)
- . Fixed bug GH-25304 (JIT: SEGV in exception handler stub after OOM inside an
- output-buffer callback). (David Carlier)
- PDO_Firebird:
. Fixed stack buffer overflow with long connection user names, passwords,
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index 8b0c2401b30..2b0b2d62a19 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -3680,6 +3680,11 @@ ZEND_API void ZEND_FASTCALL zend_handle_delayed_oom(void)
/* Bailout discards EG(current_execute_data). Would be better to avoid the bailout here. */
EG(current_execute_data) = execute_data;
+ /* This function may be called from the VM interrupt handler: opline is not
+ * executed yet. Set opline_before_exception to NULL so
+ * ZEND_HANDLE_EXCEPTION does not use it. */
+ EG(opline_before_exception) = NULL;
+
zend_mm_oom_info_dtor(info);
info->state = ZEND_OOM_STATE_HANDLED;
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 667f98c1716..f9432cb6585 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -8141,7 +8141,7 @@ ZEND_VM_HANDLER(149, ZEND_HANDLE_EXCEPTION, ANY, ANY)
const zend_op *throw_op = EG(opline_before_exception);
/* Exception was thrown before executing any op, or between two ops (see
- * zend_interrupt_helper). */
+ * zend_handle_delayed_oom()). */
if (UNEXPECTED(!throw_op)) {
free_unfinished_calls(execute_data);
ZEND_VM_DISPATCH_TO_HELPER(zend_dispatch_try_catch_finally_helper, try_catch_offset, -1, op_num, -1);
@@ -10437,7 +10437,6 @@ ZEND_VM_HELPER(zend_interrupt_helper, ANY, ANY)
zend_timeout();
} else if (ZEND_HAS_OOM()) {
zend_handle_delayed_oom();
- EG(opline_before_exception) = NULL;
HANDLE_EXCEPTION();
} else if (zend_interrupt_function) {
zend_interrupt_function(execute_data);
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index f29d8313424..3137c55eac0 100644
Binary files a/Zend/zend_vm_execute.h and b/Zend/zend_vm_execute.h differ
diff --git a/ext/opcache/jit/zend_jit_ir.c b/ext/opcache/jit/zend_jit_ir.c
index e6029729bf4..1cdd92e1240 100644
--- a/ext/opcache/jit/zend_jit_ir.c
+++ b/ext/opcache/jit/zend_jit_ir.c
@@ -2078,7 +2078,6 @@ static int zend_jit_interrupt_handler_stub(zend_jit_ctx *jit)
ir_ref if_delayed_oom = ir_IF(ir_LOAD_U8(ir_ADD_OFFSET(jit_EG(delayed_oom), offsetof(zend_oom_info, state))));
ir_IF_TRUE(if_delayed_oom);
ir_CALL(IR_VOID, ir_CONST_FC_FUNC(zend_handle_delayed_oom));
- ir_STORE(jit_EG(opline_before_exception), IR_NULL);
// LOAD_OPLINE()
jit_STORE_IP(jit, ir_LOAD_A(jit_EX(opline)));
ir_ref if_delayed_oom_end = ir_END();
diff --git a/ext/opcache/tests/jit/gh25304.phpt b/ext/opcache/tests/jit/gh25304.phpt
deleted file mode 100644
index 3eddda9f4db..00000000000
--- a/ext/opcache/tests/jit/gh25304.phpt
+++ /dev/null
@@ -1,29 +0,0 @@
---TEST--
-GH-25304 (JIT: SEGV in exception handler stub after OOM inside an output-buffer callback)
---CREDITS--
-YuanchengJiang
---EXTENSIONS--
-opcache
---SKIPIF--
-<?php
-if (getenv("USE_ZEND_ALLOC") === "0") die("skip Zend MM disabled");
-?>
---INI--
-memory_limit=16M
-opcache.enable=1
-opcache.enable_cli=1
-opcache.jit=function
-opcache.jit_buffer_size=64M
---FILE--
-<?php
-$o = new stdClass;
-ob_start(function ($buffer) use (&$storage) {
- $storage .= $buffer;
- return '';
-}, 1);
-while ($o < 10);
-?>
---EXPECTF--
-Notice: Object of class stdClass could not be converted to int in %s on line %d
-
-Fatal error: Allowed memory size of %d bytes exhausted%S(tried to allocate %d bytes) in %s on line %d