From b73eb563b060037fe3b79edda6428c4e10004919 Mon Sep 17 00:00:00 2001 From: lpy Date: Wed, 26 Feb 2014 14:30:13 +0800 Subject: [PATCH 1/2] Add empty text check for first child of pre in innerHTML.(fixes #1743) --- src/components/script/dom/htmlserializer.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/script/dom/htmlserializer.rs b/src/components/script/dom/htmlserializer.rs index 482c724666b..e6822e79215 100644 --- a/src/components/script/dom/htmlserializer.rs +++ b/src/components/script/dom/htmlserializer.rs @@ -104,7 +104,7 @@ fn serialize_elem(elem: &JS, open_elements: &mut ~[~str]) -> ~str { match elem.get().node.first_child { Some(ref child) if child.is_text() => { let text: JS = CharacterDataCast::to(child); - if text.get().data[0] == 0x0A as u8 { + if text.get().data.len() > 0 && text.get().data[0] == 0x0A as u8 { rv.push_str("\x0A"); } }, From 2d5051e9aa5940b5de3b613f1a65b6b58824df4e Mon Sep 17 00:00:00 2001 From: lpy Date: Wed, 26 Feb 2014 20:47:08 +0800 Subject: [PATCH 2/2] Add test --- src/test/html/content/test_innerHTML.html | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/test/html/content/test_innerHTML.html diff --git a/src/test/html/content/test_innerHTML.html b/src/test/html/content/test_innerHTML.html new file mode 100644 index 00000000000..1f0cf235526 --- /dev/null +++ b/src/test/html/content/test_innerHTML.html @@ -0,0 +1,11 @@ + + + + + +