Join GitHub today
GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.
Sign upapply user scripts correctly #15874
Merged
apply user scripts correctly #15874
Conversation
highfive
commented
Mar 8, 2017
highfive
commented
Mar 8, 2017
|
|
|
r? @nox |
components/script/dom/userscripts.rs
Outdated
| let mut f = File::open(&file).unwrap(); | ||
| let mut contents = vec![]; | ||
| f.read_to_end(&mut contents).unwrap(); | ||
| let script_text = String::from_utf8(contents).unwrap(); |
This comment has been minimized.
This comment has been minimized.
SimonSapin
Mar 13, 2017
Member
This should use String::from_utf8_lossy, to replace UTF-8 errors with U+FFFD instead of panicking. This show that Firefox does so for external scripts:
data:text/html,<script src='data:text/html;charset=utf-8,document.write("%2580".charCodeAt(0).toString(16))'></script>fffd
components/script/dom/userscripts.rs
Outdated
| let mut contents = vec![]; | ||
| f.read_to_end(&mut contents).unwrap(); | ||
| let script_text = String::from_utf8(contents).unwrap(); | ||
| win.upcast::<GlobalScope>().evaluate_js_on_global_with_result(&script_text, rval.handle_mut()); |
This comment has been minimized.
This comment has been minimized.
SimonSapin
Mar 13, 2017
Member
@nox, does this line look right? (It doesn’t look particularly wrong to me, I just don’t know.)
This comment has been minimized.
This comment has been minimized.
replace to utf8_lossy
|
@bors-servo r+ |
|
|
|
|
bors-servo
added a commit
that referenced
this pull request
Mar 13, 2017
apply user scripts correctly <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #15082 <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15874) <!-- Reviewable:end -->
|
|
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.
sendilkumarn commentedMar 8, 2017
•
edited by larsbergstrom
./mach build -ddoes not report any errors./mach test-tidydoes not report any errorsThis change is