mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-07-24 18:02:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibXML: Allow empty systemid when parsing document type

Browse source 
This fixes at least one WPT under /domparsing
This commit is contained in:
Florian Cramer 2024-10-21 15:11:31 +02:00 • committed by Ali Mohammad Pur
parent 7372b2af48
commit 89192ecc46
Notes: github-actions[bot] 2024-10-23 19:31:51 +00:00
4 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Tests/LibWeb/Text/expected/DOM/domparser-parsefromstring-xml-empty-systemid.txt Normal file
View file

@ -0,0 +1 @@
PASSED

9
Tests/LibWeb/Text/input/DOM/domparser-parsefromstring-xml-empty-systemid.html Normal file
View file

@ -0,0 +1,9 @@
<script src="../include.js"></script>
<script>
test(() => {
var doc = new DOMParser().parseFromString('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" ""><html><div id="test"/></html>', 'application/xhtml+xml');
if (doc.getElementById('test')) {
println('PASSED');
}
});
</script>

6
Userland/Libraries/LibXML/Parser/Parser.cpp
View file

@ -259,7 +259,7 @@ requires(IsCallableWithArguments<Pred, bool, char>) ErrorOr<StringView, ParseErr
} }
template<typename Pred> template<typename Pred>
requires(IsCallableWithArguments<Pred, bool, char>) ErrorOr<StringView, ParseError> Parser::expect_many(Pred predicate, StringView description) requires(IsCallableWithArguments<Pred, bool, char>) ErrorOr<StringView, ParseError> Parser::expect_many(Pred predicate, StringView description, bool allow_empty)
{ {
auto rollback = rollback_point(); auto rollback = rollback_point();
auto start = m_lexer.tell(); auto start = m_lexer.tell();
@ -269,7 +269,7 @@ requires(IsCallableWithArguments<Pred, bool, char>) ErrorOr<StringView, ParseErr
m_lexer.ignore(); m_lexer.ignore();
} }
if (m_lexer.tell() == start) { if (m_lexer.tell() == start && !allow_empty) {
if (m_options.treat_errors_as_fatal) { if (m_options.treat_errors_as_fatal) {
return parse_error(m_lexer.current_position(), Expectation { description }); return parse_error(m_lexer.current_position(), Expectation { description });
} }
@ -1561,7 +1561,7 @@ ErrorOr<StringView, ParseError> Parser::parse_system_id_literal()
auto quote = TRY(expect(is_any_of("'\""sv), "any of ' or \""sv)); auto quote = TRY(expect(is_any_of("'\""sv), "any of ' or \""sv));
auto accept = accept_rule(); auto accept = accept_rule();
auto id = TRY(expect_many(is_not_any_of(quote), "not a quote"sv)); auto id = TRY(expect_many(is_not_any_of(quote), "not a quote"sv, true));
TRY(expect(quote)); TRY(expect(quote));
rollback.disarm(); rollback.disarm();

2
Userland/Libraries/LibXML/Parser/Parser.h
View file

@ -146,7 +146,7 @@ private:
template<typename Pred> template<typename Pred>
requires(IsCallableWithArguments<Pred, bool, char>) ErrorOr<StringView, ParseError> expect(Pred, StringView description); requires(IsCallableWithArguments<Pred, bool, char>) ErrorOr<StringView, ParseError> expect(Pred, StringView description);
template<typename Pred> template<typename Pred>
requires(IsCallableWithArguments<Pred, bool, char>) ErrorOr<StringView, ParseError> expect_many(Pred, StringView description); requires(IsCallableWithArguments<Pred, bool, char>) ErrorOr<StringView, ParseError> expect_many(Pred, StringView description, bool allow_empty = false);
static size_t s_debug_indent_level; static size_t s_debug_indent_level;
[[nodiscard]] auto rollback_point(SourceLocation location = SourceLocation::current()) [[nodiscard]] auto rollback_point(SourceLocation location = SourceLocation::current())