mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-04-23 13:05:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

LibWeb: Don't crash when border-spacing is set to a calc() value

Browse source 
Previously, the browser would crash if the `border-spacing` property
had 2 lengths and either one of these was set to a `calc()` value.
This commit is contained in:
Tim Ledbetter 2025-03-21 01:24:34 +00:00
parent c528c01745
commit 52bb95fe57
2 changed files with 43 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
Libraries/LibWeb/CSS/ComputedProperties.cpp
View file

@ -488,24 +488,46 @@ ImageRendering ComputedProperties::image_rendering() const
Length ComputedProperties::border_spacing_horizontal(Layout::Node const& layout_node) const
{
auto const& value = property(PropertyID::BorderSpacing);
if (value.is_length())
return value.as_length().length();
if (value.is_calculated())
return value.as_calculated().resolve_length({ .length_resolution_context = Length::ResolutionContext::for_layout_node(layout_node) }).value_or(Length(0, Length::Type::Px));
auto const& list = value.as_value_list();
return list.value_at(0, false)->as_length().length();
auto resolve_value = [&](auto const& style_value) -> Optional<Length> {
if (style_value.is_length())
return style_value.as_length().length();
if (style_value.is_calculated())
return style_value.as_calculated().resolve_length({ .length_resolution_context = Length::ResolutionContext::for_layout_node(layout_node) }).value_or(Length(0, Length::Type::Px));
return {};
};
auto const& style_value = property(PropertyID::BorderSpacing);
auto resolved_value = resolve_value(style_value);
if (!resolved_value.has_value()) {
auto const& list = style_value.as_value_list();
VERIFY(list.size() > 0);
resolved_value = resolve_value(*list.value_at(0, false));
}
VERIFY(resolved_value.has_value());
return *resolved_value;
}
Length ComputedProperties::border_spacing_vertical(Layout::Node const& layout_node) const
{
auto const& value = property(PropertyID::BorderSpacing);
if (value.is_length())
return value.as_length().length();
if (value.is_calculated())
return value.as_calculated().resolve_length({ .length_resolution_context = Length::ResolutionContext::for_layout_node(layout_node) }).value_or(Length(0, Length::Type::Px));
auto const& list = value.as_value_list();
return list.value_at(1, false)->as_length().length();
auto resolve_value = [&](auto const& style_value) -> Optional<Length> {
if (style_value.is_length())
return style_value.as_length().length();
if (style_value.is_calculated())
return style_value.as_calculated().resolve_length({ .length_resolution_context = Length::ResolutionContext::for_layout_node(layout_node) }).value_or(Length(0, Length::Type::Px));
return {};
};
auto const& style_value = property(PropertyID::BorderSpacing);
auto resolved_value = resolve_value(style_value);
if (!resolved_value.has_value()) {
auto const& list = style_value.as_value_list();
VERIFY(list.size() > 1);
resolved_value = resolve_value(*list.value_at(1, false));
}
VERIFY(resolved_value.has_value());
return *resolved_value;
}
CaptionSide ComputedProperties::caption_side() const

7
Tests/LibWeb/Crash/CSS/table-border-spacing-calc.html Normal file
View file

@ -0,0 +1,7 @@
<!DOCTYPE html>
<style>
table {
border-spacing: calc(1px + 1px) calc(1px + 2px);
}
</style>
<table></table>