[Dotenv] properly parse backslashes in unquoted env vars #29222
Merged
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
xabbuh
commented
Nov 14, 2018
| Q | A |
|---|---|
| Branch? | 3.4 |
| Bug fix? | yes |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no |
| Tests pass? | yes |
| Fixed tickets | #29202 |
| License | MIT |
| Doc PR |
| @@ -246,7 +246,7 @@ private function lexValue() | |||
|
|
|||
| ++$this->cursor; | |||
| } | |||
| $value = rtrim($value); | |||
| $value = str_replace('\\\\', '\\', rtrim($value)); | |||
There was a problem hiding this comment.
Not sure that's enough: eg FOO=A\\$B should resolve to A\Foo when B=Foo is set previoulsy.
There was a problem hiding this comment.
you are right, and this also didn't work with double-quoted strings, both cases should be good now
xabbuh
commented
Nov 14, 2018
| @@ -350,7 +352,7 @@ private function resolveVariables($value) | |||
| } | |||
|
|
|||
| $regex = '/ | |||
| (\\\\)? # escaped with a backslash? | |||
| ((?:\\\\)?\\\\)? # escaped with a backslash? | |||
There was a problem hiding this comment.
Thinking more about it this will probably not be enough as there could be an endless number of backslashes and we need to check whether we have an even or an odd number of them to decide whether or not the $ character is escaped.
cd30eb9 to
d418826
Compare
fabpot
approved these changes
Nov 24, 2018
|
Thank you @xabbuh. |
fabpot
added a commit
that referenced
this pull request
Nov 24, 2018
…xabbuh) This PR was merged into the 3.4 branch. Discussion ---------- [Dotenv] properly parse backslashes in unquoted env vars | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #29202 | License | MIT | Doc PR | Commits ------- 785fff5 properly parse backslashes in unquoted env vars
This was referenced Nov 26, 2018
Merged
Merged
Closed
Merged
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.