system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-09-06 17:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

LibWeb: Don't crash when querying detached circle element properties

Browse source
This commit is contained in:
Tim Ledbetter 2024-03-23 07:08:54 +00:00 committed by Andreas Kling
parent cab0cb5b13
commit 3518f39b60
3 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Tests/LibWeb/Text/expected/SVG/svg-circle-detached.txt Normal file
View file

@ -0,0 +1 @@
PASS (didn't crash)

10
Tests/LibWeb/Text/input/SVG/svg-circle-detached.html Normal file
View file

@ -0,0 +1,10 @@
<script src="../include.js"></script>
<script>
test(() => {
const circleElement = document.createElementNS("http://www.w3.org/2000/svg", "circle");
const cx = circleElement.cx;
const cy = circleElement.cy;
const r = circleElement.r;
println("PASS (didn't crash)");
});
</script>

18
Userland/Libraries/LibWeb/SVG/SVGCircleElement.cpp
View file

@ -85,8 +85,10 @@ JS::NonnullGCPtr<SVGAnimatedLength> SVGCircleElement::cx() const
{
// FIXME: Create a proper animated value when animations are supported.
auto make_length = [&] {
if (auto cx = computed_css_values()->length_percentage(CSS::PropertyID::Cx); cx.has_value())
return SVGLength::from_length_percentage(realm(), *cx);
if (auto const* style = computed_css_values(); style) {
if (auto cx = style->length_percentage(CSS::PropertyID::Cx); cx.has_value())
return SVGLength::from_length_percentage(realm(), *cx);
}
return SVGLength::create(realm(), 0, 0.0f);
};
return SVGAnimatedLength::create(realm(), make_length(), make_length());
@ -97,8 +99,10 @@ JS::NonnullGCPtr<SVGAnimatedLength> SVGCircleElement::cy() const
{
// FIXME: Create a proper animated value when animations are supported.
auto make_length = [&] {
if (auto cy = computed_css_values()->length_percentage(CSS::PropertyID::Cy); cy.has_value())
return SVGLength::from_length_percentage(realm(), *cy);
if (auto const* style = computed_css_values(); style) {
if (auto cy = style->length_percentage(CSS::PropertyID::Cy); cy.has_value())
return SVGLength::from_length_percentage(realm(), *cy);
}
return SVGLength::create(realm(), 0, 0.0f);
};
return SVGAnimatedLength::create(realm(), make_length(), make_length());
@ -109,8 +113,10 @@ JS::NonnullGCPtr<SVGAnimatedLength> SVGCircleElement::r() const
{
// FIXME: Create a proper animated value when animations are supported.
auto make_length = [&] {
if (auto r = computed_css_values()->length_percentage(CSS::PropertyID::R); r.has_value())
return SVGLength::from_length_percentage(realm(), *r);
if (auto const* style = computed_css_values(); style) {
if (auto r = computed_css_values()->length_percentage(CSS::PropertyID::R); r.has_value())
return SVGLength::from_length_percentage(realm(), *r);
}
return SVGLength::create(realm(), 0, 0.0f);
};
return SVGAnimatedLength::create(realm(), make_length(), make_length());