Fix GH-16188: Handle references after fetching Exception properties #16196
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
nielsdos
reviewed
Oct 3, 2024
Zend/zend_exceptions.c
Outdated
|
|
||
| ZEND_PARSE_PARAMETERS_NONE(); | ||
|
|
||
| ZVAL_COPY(return_value, GET_PROPERTY_SILENT(ZEND_THIS, ZEND_STR_PREVIOUS)); | ||
| prop = GET_PROPERTY(ZEND_THIS, ZEND_STR_PREVIOUS); |
There was a problem hiding this comment.
Is the change from silent to non-silent intentional?
Zend/zend_exceptions.c
Outdated
Comment on lines
651
to
652
| ZVAL_DEREF(prop); | ||
| ZVAL_COPY(return_value, prop); |
There was a problem hiding this comment.
We have ZVAL_COPY_DEREF, although I see pre-existing places with this pattern too...
nielsdos
approved these changes
Oct 4, 2024
| break; | ||
| } | ||
| } | ||
| zend_string_release_ex(fname, 0); | ||
|
|
||
| exception = ZEND_THIS; | ||
| /* Reset apply counts */ | ||
| while (exception && Z_TYPE_P(exception) == IS_OBJECT && (base_ce = i_get_exception_base(Z_OBJ_P(exception))) && instanceof_function(Z_OBJCE_P(exception), base_ce)) { | ||
| while (Z_TYPE_P(exception) == IS_OBJECT && (base_ce = i_get_exception_base(Z_OBJ_P(exception))) && instanceof_function(Z_OBJCE_P(exception), base_ce)) { |
There was a problem hiding this comment.
Speaking of cleanup: we have a similar exception NULL-check on line 670. But that doesn't need to be in this PR.
arnaud-lb
added a commit
that referenced
this pull request
Oct 7, 2024
* PHP-8.2: NEWS for GH-16196 Handle references properties of the Exception class
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.
Fixes GH-16188.
Exceptionassumes that the result ofzend_read_property()have the right type, relying on property type hints. However the property value may also be a reference so we have to deref.This was already done for
protectedproperties as it's possible to assign them directly in sub-class, but not forprivateones.