Ensure zend_ast_fetch_class uses scope it is provided to fetch classes #7649
Conversation
This file contains 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
Addresses bug 81611.
nikic
reviewed
Nov 15, 2021
| int fetch_sub_type = fetch_type & ZEND_FETCH_CLASS_MASK; | ||
|
|
||
| check_fetch_type: | ||
| switch (fetch_sub_type) { | ||
| case ZEND_FETCH_CLASS_SELF: | ||
| scope = zend_get_executed_scope(); | ||
| if (scope == NULL) { |
There was a problem hiding this comment.
I think we could get into trouble here if the expression is supposed to be evaluated at global scope, in which case scope will be NULL and will fall back to the executed scope here. So we'd have to distinguish an explicit scope vs the fallback to the executed scope separately.
There was a problem hiding this comment.
Ah, forgot about global being NULL. Seems like the signature should allow providing the explicit vs execution scope? I'm out of my depth though so feel free to change/modify this.
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.
Addresses bug 81611.
I'm a bit unsure on whether there's a better way to do this though...
cc @nikic