We use cookies to ensure you get the best experience on our website
Home Explore Help
Register Sign In
0ct0pu5
/
ladybird
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

LibWeb: Don't overwrite existing text content when flushing HTML parser

If we run an inline script from the HTML parser, it may append a text
node to the current insertion point.

If there was text content immediately following the script element,
we would previously overwrite the script-inserted text content, due to
an oversight in the way we select an appropriate insertion point

This patch fixes the issue by only inserting parser content into
existing text nodes if they are empty.
Andreas Kling 1 year ago
parent
c7f416682b
commit
e2740bd19d
3 changed files with 13 additions and 3 deletions
Unified View Show Diff Stats
  1. 1 0
      Tests/LibWeb/Text/expected/scripted-dom-insertion-during-html-parse.txt
  2. 4 0
      Tests/LibWeb/Text/input/scripted-dom-insertion-during-html-parse.html
  3. 8 3
      Userland/Libraries/LibWeb/HTML/Parser/HTMLParser.cpp

+ 1 - 0
Tests/LibWeb/Text/expected/scripted-dom-insertion-during-html-parse.txt
View File 

@@ -0,0 +1 @@
 
+ PASS

+ 4 - 0
Tests/LibWeb/Text/input/scripted-dom-insertion-during-html-parse.html
View File 

@@ -0,0 +1,4 @@
 
+<body></body>
 
+<script>
 
+    document.body.appendChild(document.createTextNode("PASS"));
 
+</script>

+ 8 - 3
Userland/Libraries/LibWeb/HTML/Parser/HTMLParser.cpp
View File 

@@ -998,11 +998,16 @@ void HTMLParser::parse_generic_raw_text_element(HTMLToken& token)
 
     m_insertion_mode = InsertionMode::Text;
 
     m_insertion_mode = InsertionMode::Text;
 
 }
 
 }
 
 
 
+static bool is_empty_text_node(DOM::Node const* node)
 
+{
 
+    return node && node->is_text() && static_cast<DOM::Text const*>(node)->data().is_empty();
 
+}
 
+
 
 DOM::Text* HTMLParser::find_character_insertion_node()
 
 DOM::Text* HTMLParser::find_character_insertion_node()
 
 {
 
 {
 
     auto adjusted_insertion_location = find_appropriate_place_for_inserting_node();
 
     auto adjusted_insertion_location = find_appropriate_place_for_inserting_node();
 
     if (adjusted_insertion_location.insert_before_sibling) {
 
     if (adjusted_insertion_location.insert_before_sibling) {
 
-        if (adjusted_insertion_location.insert_before_sibling->previous_sibling() && adjusted_insertion_location.insert_before_sibling->previous_sibling()->is_text())
 
+        if (is_empty_text_node(adjusted_insertion_location.insert_before_sibling->previous_sibling()))
 
             return static_cast<DOM::Text*>(adjusted_insertion_location.insert_before_sibling->previous_sibling());
 
             return static_cast<DOM::Text*>(adjusted_insertion_location.insert_before_sibling->previous_sibling());
 
         auto new_text_node = realm().heap().allocate<DOM::Text>(realm(), document(), "");
 
         auto new_text_node = realm().heap().allocate<DOM::Text>(realm(), document(), "");
 
         adjusted_insertion_location.parent->insert_before(*new_text_node, *adjusted_insertion_location.insert_before_sibling);
 
         adjusted_insertion_location.parent->insert_before(*new_text_node, *adjusted_insertion_location.insert_before_sibling);
 
@@ -1010,8 +1015,8 @@ DOM::Text* HTMLParser::find_character_insertion_node()
 
     }
 
     }
 
     if (adjusted_insertion_location.parent->is_document())
 
     if (adjusted_insertion_location.parent->is_document())
 
         return nullptr;
 
         return nullptr;
 
-    if (adjusted_insertion_location.parent->last_child() && adjusted_insertion_location.parent->last_child()->is_text())
 
-        return verify_cast<DOM::Text>(adjusted_insertion_location.parent->last_child());
 
+    if (is_empty_text_node(adjusted_insertion_location.parent->last_child()))
 
+        return static_cast<DOM::Text*>(adjusted_insertion_location.parent->last_child());
 
     auto new_text_node = realm().heap().allocate<DOM::Text>(realm(), document(), "");
 
     auto new_text_node = realm().heap().allocate<DOM::Text>(realm(), document(), "");
 
     MUST(adjusted_insertion_location.parent->append_child(*new_text_node));
 
     MUST(adjusted_insertion_location.parent->append_child(*new_text_node));
 
     return new_text_node;
 
     return new_text_node;

Contact | Legal | Takedown | Status
Self-hosted public services - About
NibbleSpot by 0ct0pu5