Don’t reset func in zend_closure_internal_handler #9849
Merged
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
The pointer is used in _zend_observe_fcall_begin().
|
Oh. Yes, that was a mistake. Merged :-) |
|
Please don't forget to merge upwards next time (GH won't do this automatically) :) |
|
Note: I initially did not merge that change because it was incorrect, then forgot about it and merged it too quickly today. Fixed that in 8e49d7f. The main point is that you just swapped a NULL pointer by an use-after-free (the OBJ_RELEASE() in that line before the EX(func) = NULL may release the closure if it's in a temporary only). |
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.
The pointer is used in
_zend_observe_fcall_begin().The new test segfaulted before the change.
This change was already part of #9823 and I think the commit was missed by accident when merging that PR.