Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork9.7k
Fixed the escaping of back slashes and << in console output#23730
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Uh oh!
There was an error while loading.Please reload this page.
Conversation
| $len =strlen($text); | ||
| $text =rtrim($text,'\\'); | ||
| $text .=str_repeat('<<',$len -strlen($text)); | ||
| $text .=str_repeat('\0',$len -strlen($text)); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
so, this relies on the fact that \0 is not printable, to use it as an escape character?
to be safe, what about removing\0 from $text also?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Note that currently the PR does not use the null character but a backslash followed by a zero. Wouldn't it be better to actually use the null character ("\0" instead of'\0')?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
tested with"\0" on 3.0.4 and seems to work, thanks@javiereguiluz for picking this up, much appreciated 👍 :)
javiereguiluz commentedAug 28, 2017
Thanks for the reviews! I've fixed the error pointed out by@julienfalque. About this question from@nicolas-grekas:
I'm not sure I fully understand what you mean. Can you show me the code changes you want me to do? Thanks! |
| if ('\\' ===substr($text, -1)) { | ||
| $len =strlen($text); | ||
| $text =rtrim($text,'\\'); | ||
| $text .=str_repeat('<<',$len -strlen($text)); |
nicolas-grekasAug 29, 2017 • edited
Loading Uh oh!
There was an error while loading.Please reload this page.
edited
Uh oh!
There was an error while loading.Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
I meant this here:$text = str_replace("\0", '', $text);
(or more generally: what happens/should happen when $text already has "\0" in it?)
fabpot commentedAug 29, 2017
Thank you@javiereguiluz. |
…t (javiereguiluz)This PR was squashed before being merged into the 2.7 branch (closes#23730).Discussion----------Fixed the escaping of back slashes and << in console output| Q | A| ------------- | ---| Branch? | 2.7| Bug fix? | yes| New feature? | no| BC breaks? | no| Deprecations? | no| Tests pass? | yes| Fixed tickets |#18481| License | MIT| Doc PR | -Not sure if it's a valid solution, but this is my attempt to solve#18481.Commits-------d5cb1fe Fixed the escaping of back slashes and << in console output
Not sure if it's a valid solution, but this is my attempt to solve#18481.