Repository navigation
Conversation
Fix php#25304 zend_handle_delayed_oom() always reset EG(opline_before_exception) to NULL, even when called from zend_call_function() in the middle of an opcode. The JIT exception handler stubs then dereferenced it. Only the VM and JIT interrupt handlers run between two opcodes, so they now clear it instead.
iliaal
left a comment
There was a problem hiding this comment.
LGTM. Reproduced the segfault under function and tracing JIT on an NTS debug 8.4 build; gone with the patch. This is an 8.4.28RC1 regression, so it should land before GA.
|
See failure in https://github.com/php/php-src/actions/runs/44315751807/job/134841390791. This was temporarily reverted. Please fix the failure and merge again once ready. |
|
@devnexen To clarify: The failure happened in 8.5. So the CI labels won't help here. |
|
Ok what we can (because I ve tried my fix on 8.5) is to create a separate PR for 8.5 onwards with this change alone and then once merged merging this one again wdyt ? |
|
@devnexen Yes, feel free to create a separate PR. You can also usually do that against your fork. I stopped the workflow for now to avoid hogging resources. |
Fix #25304
zend_handle_delayed_oom() always reset EG(opline_before_exception) to NULL, even when called from zend_call_function() in the middle of an opcode. The JIT exception handler stubs then dereferenced it. Only the VM and JIT interrupt handlers run between two opcodes, so they now clear it instead.