[JsonPath] Improve escape sequence validation in name selector #60802
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
Member
alexandre-daubois
commented
Jun 16, 2025
| Q | A |
|---|---|
| Branch? | 7.3 |
| Bug fix? | yes |
| New feature? | no |
| Deprecations? | no |
| Issues | - |
| License | MIT |
stof
reviewed
Jun 16, 2025
| 'b' => "\b", | ||
| 'f' => "\f", | ||
| 'b' => "\x08", | ||
| 'f' => "\x0C", |
There was a problem hiding this comment.
\f is a mistake, but \b is actually not recognized by PHP, thus using the hex value directly
03d86c3 to
fe04be1
Compare
fe04be1 to
531a978
Compare
| @@ -227,4 +233,24 @@ public static function parseCommaSeparatedValues(string $expr): array | |||
|
|
|||
| return $parts; | |||
| } | |||
|
|
|||
| private static function validateEscapeSequences(string $str, string $quoteChar): void | |||
There was a problem hiding this comment.
would it make sense to merge the new loop with the existing one? can we do everything in one pass?
stof
reviewed
Jun 27, 2025
| } | ||
|
|
||
| if (!\in_array($next = $str[$i + 1], [$quoteChar, '\\', '/', 'b', 'f', 'n', 'r', 't', 'u'], true)) { | ||
| throw new JsonCrawlerException('', \sprintf('Invalid escape sequence "\\%s" in %s-quoted string', $next, "'" === $quoteChar ? 'single' : 'double')); |
There was a problem hiding this comment.
I'm quite sure this case could be detected during the unescaping loop, as this exception corresponds to the default => $char.$str[$i + 1], // keep the backslash branch in the match, which could become a throwing branch.
| } | ||
|
|
||
| if ('u' === $next && (!isset($str[$i + 5]) || !ctype_xdigit(substr($str, $i + 2, 4)))) { | ||
| throw new JsonCrawlerException('', 'Invalid unicode escape sequence'); |
There was a problem hiding this comment.
unescapeUnicodeSequence could be responsible for this validation instead of treating invalid sequences as literal (which would become dead code if we validate in a previous loop)
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.