RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 11:58:12 +00:00
Code Issues Activity Actions

LibWeb: Handle more benign parse errors in the "in body" insertion mode

Browse source
This commit is contained in:
Andreas Kling 2020-05-27 18:18:39 +02:00
parent 1de29e3f59
commit 1b0c39ca60
1 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Libraries/LibWeb/Parser/HTMLDocumentParser.cpp
View file

@ -563,8 +563,8 @@ void HTMLDocumentParser::handle_in_body(HTMLToken& token)
if (m_stack_of_open_elements.has_in_button_scope("p")) if (m_stack_of_open_elements.has_in_button_scope("p"))
close_a_p_element(); close_a_p_element();
if (current_node().tag_name().is_one_of("h1", "h2", "h3", "h4", "h5", "h6")) { if (current_node().tag_name().is_one_of("h1", "h2", "h3", "h4", "h5", "h6")) {
// FIXME: This is a parse error! PARSE_ERROR();
TODO(); m_stack_of_open_elements.pop();
} }
insert_html_element(token); insert_html_element(token);
return; return;
@ -577,24 +577,19 @@ void HTMLDocumentParser::handle_in_body(HTMLToken& token)
&& !m_stack_of_open_elements.has_in_scope("h4") && !m_stack_of_open_elements.has_in_scope("h4")
&& !m_stack_of_open_elements.has_in_scope("h5") && !m_stack_of_open_elements.has_in_scope("h5")
&& !m_stack_of_open_elements.has_in_scope("h6")) { && !m_stack_of_open_elements.has_in_scope("h6")) {
TODO(); PARSE_ERROR();
return;
} }
generate_implied_end_tags(); generate_implied_end_tags();
if (current_node().tag_name() != token.tag_name()) { if (current_node().tag_name() != token.tag_name()) {
TODO(); PARSE_ERROR();
} }
for (;;) { for (;;) {
auto popped_element = m_stack_of_open_elements.pop(); auto popped_element = m_stack_of_open_elements.pop();
if (popped_element->tag_name() == "h1" if (popped_element->tag_name().is_one_of("h1", "h2", "h3", "h4", "h5", "h6"))
|| popped_element->tag_name() == "h2"
|| popped_element->tag_name() == "h3"
|| popped_element->tag_name() == "h4"
|| popped_element->tag_name() == "h5"
|| popped_element->tag_name() == "h6") {
break; break;
}
} }
return; return;
} }
@ -617,22 +612,25 @@ void HTMLDocumentParser::handle_in_body(HTMLToken& token)
} }
if (token.is_start_tag() && token.tag_name().is_one_of("address", "article", "aside", "blockquote", "center", "details", "dialog", "dir", "div", "dl", "fieldset", "figcaption", "figure", "footer", "header", "hgroup", "main", "menu", "nav", "ol", "p", "section", "summary", "ul")) { if (token.is_start_tag() && token.tag_name().is_one_of("address", "article", "aside", "blockquote", "center", "details", "dialog", "dir", "div", "dl", "fieldset", "figcaption", "figure", "footer", "header", "hgroup", "main", "menu", "nav", "ol", "p", "section", "summary", "ul")) {
// FIXME: If the stack of open elements has a p element in button scope, then close a p element. if (m_stack_of_open_elements.has_in_button_scope("p"))
close_a_p_element();
insert_html_element(token); insert_html_element(token);
return; return;
} }
if (token.is_end_tag() && token.tag_name().is_one_of("address", "article", "aside", "blockquote", "center", "details", "dialog", "dir", "div", "dl", "fieldset", "figcaption", "figure", "footer", "header", "hgroup", "main", "menu", "nav", "ol", "p", "section", "summary", "ul")) { if (token.is_end_tag() && token.tag_name().is_one_of("address", "article", "aside", "blockquote", "center", "details", "dialog", "dir", "div", "dl", "fieldset", "figcaption", "figure", "footer", "header", "hgroup", "main", "menu", "nav", "ol", "p", "section", "summary", "ul")) {
// FIXME: If the stack of open elements has a p element in button scope, then close a p element. if (m_stack_of_open_elements.has_in_button_scope("p"))
close_a_p_element();
if (!m_stack_of_open_elements.has_in_scope(token.tag_name())) { if (!m_stack_of_open_elements.has_in_scope(token.tag_name())) {
ASSERT_NOT_REACHED(); PARSE_ERROR();
return;
} }
generate_implied_end_tags(); generate_implied_end_tags();
if (current_node().tag_name() != token.tag_name()) { if (current_node().tag_name() != token.tag_name()) {
ASSERT_NOT_REACHED(); PARSE_ERROR();
} }
m_stack_of_open_elements.pop(); m_stack_of_open_elements.pop();