Fix GH-18105: Wrong file & line on exception trace with trait default parameter#21657
Open
iliaal wants to merge 1 commit intophp:masterfrom
Open
Fix GH-18105: Wrong file & line on exception trace with trait default parameter#21657iliaal wants to merge 1 commit intophp:masterfrom
iliaal wants to merge 1 commit intophp:masterfrom
Conversation
…ult parameter When a trait method has a default parameter using `new` and the constructor throws, the exception's file/line pointed to the class using the trait rather than where the throw actually occurred. `EG(filename_override)`, set to the scope's filename during AST evaluation, leaked into the constructor's VM re-entry. Clear the override before constructor calls in `zend_ast_evaluate_inner`'s ZEND_AST_NEW handler so normal stack frame resolution applies. Closes phpGH-18105
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
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.
When a trait method has a default parameter using
new(e.g.,new ThrowableParam) and the constructor throws, the exception reports the file of the class using the trait, not the file where the throw occurs.zend_ast_evaluate_exsetsEG(filename_override)to the scope's filename during constant expression evaluation. For trait clones, the scope points to the using class's file. WhenZEND_AST_NEWcalls the constructor and it throws,zend_default_exception_newpicks up this stale override.Save and clear
EG(filename_override)before constructor calls inzend_ast_evaluate_inner'sZEND_AST_NEWhandler, restore after. The VM's normal stack frame resolution then applies during constructor execution.Fixes #18105