Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-31 19:20:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

Don't fail converting invalid UTF8 when fetching JS source. Fixes #3302.

Browse source
This commit is contained in:
Josh Matthews 2014-09-13 11:22:29 -04:00
parent 5a90f18b7e
commit 8748818b7e
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/script/html/hubbub_html_parser.rs
View file

@ -20,6 +20,9 @@ use dom::types::*;
use html::cssparse::{StylesheetProvenance, UrlProvenance, spawn_css_parser}; use html::cssparse::{StylesheetProvenance, UrlProvenance, spawn_css_parser};
use page::Page; use page::Page;
use encoding::all::UTF_8;
use encoding::types::{Encoding, DecodeReplace};
use hubbub::hubbub; use hubbub::hubbub;
use hubbub::hubbub::{NullNs, HtmlNs, MathMlNs, SvgNs, XLinkNs, XmlNs, XmlNsNs}; use hubbub::hubbub::{NullNs, HtmlNs, MathMlNs, SvgNs, XLinkNs, XmlNs, XmlNsNs};
use servo_net::resource_task::{Load, LoadData, Payload, Done, ResourceTask, load_whole_resource}; use servo_net::resource_task::{Load, LoadData, Payload, Done, ResourceTask, load_whole_resource};
@ -142,8 +145,9 @@ fn js_script_listener(to_parent: Sender<HtmlDiscoveryMessage>,
error!("error loading script {:s}", url.serialize()); error!("error loading script {:s}", url.serialize());
} }
Ok((metadata, bytes)) => { Ok((metadata, bytes)) => {
let decoded = UTF_8.decode(bytes.as_slice(), DecodeReplace).unwrap();
result_vec.push(JSFile { result_vec.push(JSFile {
data: String::from_utf8(bytes).unwrap().to_string(), data: decoded.to_string(),
url: metadata.final_url, url: metadata.final_url,
}); });
} }