During a jump, handle interrupts before updating the opline #7642
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
If an exception is thrown by the interrupt handler after updating the opline, the result variable will be freed even though it has not been written to. So: * In jump handlers, check for an interrupt before doing anything else. If an interrupt is handled, return to the VM. The jump handler will then be re-entered if there was no exception. * In smart branches, check for EG(vm_interrupt) before checking for EG(exception), so that exception handling from the ordinary and interrupt cases can be combined. Exceptions are handled before the return value is populated, but the existing hack stops it from crashing. * Remove the interrupt check from ZEND_VM_ENTER_EX, for consistency with the other variants. Checking for an interrupt here seems to be unnecessary. * In the goto and switch VM kinds, disable interrupt handling in smart branches. Maybe Dmitry can figure out how to make it work. The JIT is affected and is not fixed here. Partially fixes bug #81610.
|
Did you see this #7624 ? |
No I hadn't. I'll test it. |
|
The merged fixes by @dstogov work for me. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If an exception is thrown by the interrupt handler after updating the
opline, the result variable will be freed even though it has not been
written to. So:
The JIT is affected and is not fixed here.
Partially fixes bug #81610.