[ErrorHandler] Escape variable in Exception template #35588
Merged
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
Member
jderusse
commented
Feb 4, 2020
jderusse
commented
| Q | A |
|---|---|
| Branch? | 4.4 |
| Bug fix? | yes |
| New feature? | no |
| Deprecations? | no |
| Tickets | / |
| License | MIT |
| Doc PR | / |
fabpot
approved these changes
Feb 4, 2020
| } | ||
|
|
||
| foreach ($exception['trace'] as $trace) { | ||
| echo "\n "; | ||
| if ($trace['function']) { | ||
| echo 'at '.$trace['class'].$trace['type'].$trace['function'].'('.(isset($trace['args']) ? $this->formatArgsAsText($trace['args']) : '').')'; | ||
| echo $this->escape('at '.$trace['class'].$trace['type'].$trace['function']).'('.(isset($trace['args']) ? $this->formatArgsAsText($trace['args']) : '').')'; | ||
| } | ||
| if ($trace['file'] && $trace['line']) { | ||
| echo($trace['function'] ? "\n (" : 'at ').strtr(strip_tags($this->formatFile($trace['file'], $trace['line'])), [' at line '.$trace['line'] => '']).':'.$trace['line'].($trace['function'] ? ')' : ''); |
There was a problem hiding this comment.
let's remove the extra brackets and add a space after the echo anyway :)
There was a problem hiding this comment.
the args are escaped (call to strip_tags), remaining line which should not contains any html code
There was a problem hiding this comment.
@nicolas-grekas: from 83f1dca#diff-88463e7f77e3f04a4e60eb807fe6f957L34 I guess the space between echo and ( keeps being removed (incorrectly) by the CS fixer because of PHP-CS-Fixer/PHP-CS-Fixer#4817 (for which I have already proposed two fixes but...)
nicolas-grekas
approved these changes
Feb 4, 2020
|
Thank you @jderusse. |
fabpot
added a commit
that referenced
this pull request
Feb 4, 2020
…usse) This PR was merged into the 4.4 branch. Discussion ---------- [ErrorHandler] Escape variable in Exception template | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | / | License | MIT | Doc PR | / Commits ------- 629d21b Escape variable in Exception Template
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.