RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 15:17:36 +00:00
Code Issues Activity Actions

LibWeb: Ignore malformed at-rules in CSS parser

Browse source 
Fixes #12405.
This commit is contained in:
Guilherme Gonçalves 2022-02-11 17:42:11 +00:00 • committed by Andreas Kling
parent dece108f9a
commit a456759d7a
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp
View file

@ -1934,8 +1934,10 @@ RefPtr<CSSRule> Parser::convert_to_rule(NonnullRefPtr<StyleRule> rule)
auto media_query_tokens = TokenStream { rule->prelude() }; auto media_query_tokens = TokenStream { rule->prelude() };
auto media_query_list = parse_a_media_query_list(media_query_tokens); auto media_query_list = parse_a_media_query_list(media_query_tokens);
if (media_query_list.is_empty() || !rule->block())
return {};
auto child_tokens = TokenStream { rule->block().values() }; auto child_tokens = TokenStream { rule->block()->values() };
auto parser_rules = consume_a_list_of_rules(child_tokens, false); auto parser_rules = consume_a_list_of_rules(child_tokens, false);
NonnullRefPtrVector<CSSRule> child_rules; NonnullRefPtrVector<CSSRule> child_rules;
for (auto& raw_rule : parser_rules) { for (auto& raw_rule : parser_rules) {
@ -1980,7 +1982,9 @@ RefPtr<CSSRule> Parser::convert_to_rule(NonnullRefPtr<StyleRule> rule)
return {}; return {};
} }
auto child_tokens = TokenStream { rule->block().values() }; if (!rule->block())
return {};
auto child_tokens = TokenStream { rule->block()->values() };
auto parser_rules = consume_a_list_of_rules(child_tokens, false); auto parser_rules = consume_a_list_of_rules(child_tokens, false);
NonnullRefPtrVector<CSSRule> child_rules; NonnullRefPtrVector<CSSRule> child_rules;
for (auto& raw_rule : parser_rules) { for (auto& raw_rule : parser_rules) {

2
Userland/Libraries/LibWeb/CSS/Parser/StyleRule.h
View file

@ -27,7 +27,7 @@ public:
~StyleRule(); ~StyleRule();
Vector<StyleComponentValueRule> const& prelude() const { return m_prelude; } Vector<StyleComponentValueRule> const& prelude() const { return m_prelude; }
StyleBlockRule const& block() const { return *m_block; } RefPtr<StyleBlockRule> const block() const { return m_block; }
String to_string() const; String to_string() const;