Don't crash on invalid utf-8 in the HTML parser.

This was regressed by the html5ever landing.
servo · Oct 19, 2014 · b9d8533 · b9d8533 · bors-servo · Oct 19, 2014
1 parent 65856dd
commit b9d8533
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/components/script/parse/html.rs b/components/script/parse/html.rs
@@ -496,7 +496,7 @@ pub fn parse_html(page: &Page,
                         match msg {
                             Payload(data) => {
                                 // FIXME: use Vec<u8> (html5ever #34)
-                                let data = String::from_utf8(data).unwrap();
+                                let data = UTF_8.decode(data.as_slice(), DecodeReplace).unwrap();
                                 parser.tokenizer().borrow_mut().feed(data);
                             }
                             Done(Err(err)) => {

diff --git a/tests/wpt/metadata/XMLHttpRequest/open-url-encoding.htm.ini b/tests/wpt/metadata/XMLHttpRequest/open-url-encoding.htm.ini
@@ -1,3 +1,5 @@
 [open-url-encoding.htm]
   type: testharness
-  expected: CRASH
+  [XMLHttpRequest: open() - URL encoding]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/XMLHttpRequest/send-content-type-string.htm.ini b/tests/wpt/metadata/XMLHttpRequest/send-content-type-string.htm.ini
diff --git a/tests/wpt/metadata/XMLHttpRequest/send-entity-body-document.htm.ini b/tests/wpt/metadata/XMLHttpRequest/send-entity-body-document.htm.ini
@@ -1,3 +1,3 @@
 [send-entity-body-document.htm]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT