Fix GH-20504: Real instance of lazy proxy may lack magic methods existing in proxy #21093
+146
−8
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
iluuu1994
approved these changes
Feb 2, 2026
|
|
||
| if (UNEXPECTED(guard)) { | ||
| if (UNEXPECTED(guard && instance->ce->ce_flags & ZEND_ACC_USE_GUARDS)) { | ||
| uint32_t guard_type = (type == BP_VAR_IS) && zobj->ce->__isset |
Member
There was a problem hiding this comment.
Maybe add a comment that accessing zobj here is intentional?
| } | ||
|
|
||
| if (UNEXPECTED(guarded)) { | ||
| if (UNEXPECTED(guarded && instance->ce->ce_flags & ZEND_ACC_USE_GUARDS)) { |
Member
There was a problem hiding this comment.
Nit: We usually add () around & expressions.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
In GH-18039 we guard the underlying property before forwarding access to the real instance of a lazy proxy. When the real instance lacks magic methods, the assertion
zobj->ce->ce_flags & ZEND_ACC_USE_GUARDSfails inzend_get_property_guard().Fix by checking that the real instance uses guards.
Fixes GH-20504.