This repository has been archived by the owner on Dec 11, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 975
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
Also fix crashes for URLs like `data:text/html,<script>alert\(1, 1\)</script>` and `data:text/html,<script>confirm\(1, 1\)</script>`
bbondy
reviewed
Oct 18, 2016
@@ -383,6 +384,8 @@ app.on('ready', () => { | |||
title = '' | |||
} |
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 think this can be removed now
if (title == null) {
title = ''
}
bbondy
reviewed
Oct 18, 2016
@@ -368,6 +368,7 @@ app.on('ready', () => { | |||
} |
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.
ditto here
@bbondy, thanks for the review, I removed the extra lines. I can rebase and open a new PR or push directly to whatever branch you think is appropriate. Thanks! |
Perfect, I'll just do a squash merge, thanks. |
This was referenced Oct 20, 2016
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
(Realized that this can be solved with exactly what @bridiver did for alerts in #4798, just copied for confirm dialog, so replacing previous PR I had with @bridiver's sol'n)
git rebase -i
to squash commits (if needed).Test Plan:
<script>confirm(1)</script>
, so can test withdata:text/html,<script>confirm(1)</script>
as well)Fix:
dialog.showMessageBox
requires that the message and title arguments are stringsmessage
is a number (or other non-string type) it is coerced to a stringfixes #4883