fix: correct ansi_c_string regex to handle trailing escaped backslashes - #326
Open
0x-pankaj wants to merge 1 commit into
Open
fix: correct ansi_c_string regex to handle trailing escaped backslashes#3260x-pankaj wants to merge 1 commit into
0x-pankaj wants to merge 1 commit into
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
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.
Problem
The
ansi_c_stringregex/\$'([^']|\\')*'/incorrectly parsed ANSI-C quoted strings containing trailing escaped backslashes. For example:WORDCHARS=$'/-–_:,.;<>~!@#$%^&*|+=[]{}()?\'"`\\'The old regex
[^']matched any character except', including\. This meant\\at the end was consumed one character at a time — the first\was consumed by[^'], leaving the second\to also be consumed by[^'], and then'correctly closed the string. But\\'(escaped backslash followed by closing quote) would fail because\before'was consumed by[^'], then\'was treated as an escaped quote instead of letting'close the string — causing the parser to run past the intended end.Fix
Changed the regex from:
to:
By excluding
\from the single-character match[^'\\], every backslash must go through the\\.path, which always consumes backslash + the next character as a pair. This means:\\is consumed as one unit (escaped backslash) — the'after it stays free to close the string\'is consumed as one unit (escaped quote) — correctly handled\n,\t, etc. all work correctly tooTests
test/corpus/literals.txtfor:WORDCHARSassignment with trailing\\(the original bug trigger)\t\'and\\togetherFixes zed-industries/zed#51021