0ct0pu5/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

LibWeb: Fix division by zero on a zero-width viewport SVG image

Browse source 
We were previously crashing by a division by zero due to an aspect ratio
of zero on https://comicbookshop.co.nz/
This commit is contained in:
Shannon Booth 2024-05-19 14:24:52 +12:00 • committed by Andreas Kling
parent be36dbce7d
commit d48316ce15
Notes: sideshowbarker 2024-07-17 02:23:25 +09:00
3 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Tests/LibWeb/Layout/expected/zero-width-viewport-svg-image.txt Normal file
View file

@ -0,0 +1,13 @@
Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <html> at (0,0) content-size 800x600 [BFC] children: not-inline
BlockContainer <body> at (8,8) content-size 784x150 children: inline
frag 0 from ImageBox start: 0, length: 0, rect: [8,8 300x150] baseline: 150
ImageBox <img> at (8,8) content-size 300x150 children: not-inline
(SVG-as-image isolated context)
Viewport <#document> at (0,0) content-size 300x150 [BFC] children: inline
SVGSVGBox <svg> at (0,0) content-size 300x150 [SVG] children: not-inline
ViewportPaintable (Viewport<#document>) [0,0 800x600]
PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
PaintableWithLines (BlockContainer<BODY>) [8,8 784x150]
ImagePaintable (ImageBox<IMG>) [8,8 300x150]

1
Tests/LibWeb/Layout/input/zero-width-viewport-svg-image.html Executable file
View file

@ -0,0 +1 @@
<img src="data:image/svg+xml,%3Csvg%20xmlns='http://www.w3.org/2000/svg'%20viewBox='0%200%200%2040'%3E%3C/svg%3E">

11
Userland/Libraries/LibWeb/SVG/SVGDecodedImageData.cpp
View file

@ -155,9 +155,16 @@ Optional<CSSPixelFraction> SVGDecodedImageData::intrinsic_aspect_ratio() const
if (width.has_value() && height.has_value())
return *width / *height;
if (auto const& viewbox = m_root_element->view_box(); viewbox.has_value())
return CSSPixels::nearest_value_for(viewbox->width) / CSSPixels::nearest_value_for(viewbox->height);
if (auto const& viewbox = m_root_element->view_box(); viewbox.has_value()) {
auto viewbox_width = CSSPixels::nearest_value_for(viewbox->width);
if (viewbox_width == 0)
return {};
auto viewbox_height = CSSPixels::nearest_value_for(viewbox->height);
return viewbox_width / viewbox_height;
}
return {};
}