summaryrefslogtreecommitdiff
path: root/Userland/Libraries/LibXML/Parser
diff options
context:
space:
mode:
authorLuke Wilde <lukew@serenityos.org>2022-05-29 22:25:43 +0100
committerLinus Groh <mail@linusgroh.de>2022-05-30 00:16:17 +0100
commitadb5f7e485f3870be6dba550daae2f630a0804d2 (patch)
tree99f97307c4bdc8e0eb4982eb01a98beb3c7a6032 /Userland/Libraries/LibXML/Parser
parent9a97ffe8837727ce339bada865be1ee08d0d7859 (diff)
downloadserenity-adb5f7e485f3870be6dba550daae2f630a0804d2.zip
LibXML+Tests: Consume `>` in the character data ending `]]>` and test it
For example, with this input: ```xml <C>]]> ``` After seeing `<C>`, the parser will start parsing the content of the element. The content parser will then parse any character data it sees. The character parser would see the first two `]]` and consume them. Then, it would see the `>` and set the state machine to say we have seen this, but it did _not_ consume it and would instead tell GenericLexer that it should stop consuming characters. Therefore, we only consumed 2 characters. Then, it would see that we are in the state where we've seen the full `]]>` and try to take off three characters from the end of the consumed input when we only have 2 characters, causing an assertion failure as we are asking to take off more characters than there really is.
Diffstat (limited to 'Userland/Libraries/LibXML/Parser')
-rw-r--r--Userland/Libraries/LibXML/Parser/Parser.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Userland/Libraries/LibXML/Parser/Parser.cpp b/Userland/Libraries/LibXML/Parser/Parser.cpp
index 0940d76fab..d32ca51c75 100644
--- a/Userland/Libraries/LibXML/Parser/Parser.cpp
+++ b/Userland/Libraries/LibXML/Parser/Parser.cpp
@@ -891,7 +891,7 @@ ErrorOr<StringView, ParseError> Parser::parse_char_data()
// CharData ::= [^<&]* - ([^<&]* ']]>' [^<&]*)
auto cend_state = 0; // 1: ], 2: ], 3: >
auto text = m_lexer.consume_while([&](auto ch) {
- if (ch == '<' || ch == '&')
+ if (ch == '<' || ch == '&' || cend_state == 3)
return false;
switch (cend_state) {
case 0:
@@ -904,7 +904,7 @@ ErrorOr<StringView, ParseError> Parser::parse_char_data()
case 2:
if (ch == '>') {
cend_state++;
- return false;
+ return true;
}
cend_state = 0;
return true;