From c4f49e343ad3ca69f72190bd9ade49084c973822 Mon Sep 17 00:00:00 2001 From: Aliaksandr Kalenik Date: Tue, 20 Feb 2024 19:11:42 +0100 Subject: [PATCH] LibWeb: Fix division by zero in `solve_replaced_size_constraint()` Fixes crashes that occur in Discord after clicking on a direct messages conversation. --- ...ero-size-replaced-box-with-aspect-ratio.txt | 13 +++++++++++++ ...ro-size-replaced-box-with-aspect-ratio.html | 8 ++++++++ .../LibWeb/Layout/FormattingContext.cpp | 18 ++++++++++-------- 3 files changed, 31 insertions(+), 8 deletions(-) create mode 100644 Tests/LibWeb/Layout/expected/zero-size-replaced-box-with-aspect-ratio.txt create mode 100644 Tests/LibWeb/Layout/input/zero-size-replaced-box-with-aspect-ratio.html diff --git a/Tests/LibWeb/Layout/expected/zero-size-replaced-box-with-aspect-ratio.txt b/Tests/LibWeb/Layout/expected/zero-size-replaced-box-with-aspect-ratio.txt new file mode 100644 index 0000000000..2908f2e0ea --- /dev/null +++ b/Tests/LibWeb/Layout/expected/zero-size-replaced-box-with-aspect-ratio.txt @@ -0,0 +1,13 @@ +Viewport <#document> at (0,0) content-size 800x600 children: not-inline + BlockContainer at (0,0) content-size 800x16 [BFC] children: not-inline + BlockContainer at (8,8) content-size 784x0 children: not-inline + BlockContainer
at (8,8) content-size 0x0 children: inline + frag 0 from SVGSVGBox start: 0, length: 0, rect: [8,8 100x100] baseline: 100 + SVGSVGBox at (8,8) content-size 100x100 [SVG] children: not-inline + TextNode <#text> + +ViewportPaintable (Viewport<#document>) [0,0 800x600] + PaintableWithLines (BlockContainer) [0,0 800x16] overflow: [0,0 800x108] + PaintableWithLines (BlockContainer) [8,8 784x0] overflow: [8,8 100x100] + PaintableWithLines (BlockContainer
) [8,8 0x0] overflow: [8,8 100x100] + SVGSVGPaintable (SVGSVGBox) [8,8 100x100] diff --git a/Tests/LibWeb/Layout/input/zero-size-replaced-box-with-aspect-ratio.html b/Tests/LibWeb/Layout/input/zero-size-replaced-box-with-aspect-ratio.html new file mode 100644 index 0000000000..7a308b1d9f --- /dev/null +++ b/Tests/LibWeb/Layout/input/zero-size-replaced-box-with-aspect-ratio.html @@ -0,0 +1,8 @@ + +
diff --git a/Userland/Libraries/LibWeb/Layout/FormattingContext.cpp b/Userland/Libraries/LibWeb/Layout/FormattingContext.cpp index dc9112ad4d..4e8eccf0dd 100644 --- a/Userland/Libraries/LibWeb/Layout/FormattingContext.cpp +++ b/Userland/Libraries/LibWeb/Layout/FormattingContext.cpp @@ -283,14 +283,16 @@ CSSPixelSize FormattingContext::solve_replaced_size_constraint(CSSPixels input_w if (input_width > max_width && input_height < min_height) return { max_width, min_height }; - if (input_width > max_width && input_height > max_height && max_width / input_width <= max_height / input_height) - return { max_width, max(min_height, max_width / aspect_ratio) }; - if (input_width > max_width && input_height > max_height && max_width / input_width > max_height / input_height) - return { max(min_width, max_height * aspect_ratio), max_height }; - if (input_width < min_width && input_height < min_height && min_width / input_width <= min_height / input_height) - return { min(max_width, min_height * aspect_ratio), min_height }; - if (input_width < min_width && input_height < min_height && min_width / input_width > min_height / input_height) - return { min_width, min(max_height, min_width / aspect_ratio) }; + if (input_width > 0) { + if (input_width > max_width && input_height > max_height && max_width / input_width <= max_height / input_height) + return { max_width, max(min_height, max_width / aspect_ratio) }; + if (input_width > max_width && input_height > max_height && max_width / input_width > max_height / input_height) + return { max(min_width, max_height * aspect_ratio), max_height }; + if (input_width < min_width && input_height < min_height && min_width / input_width <= min_height / input_height) + return { min(max_width, min_height * aspect_ratio), min_height }; + if (input_width < min_width && input_height < min_height && min_width / input_width > min_height / input_height) + return { min_width, min(max_height, min_width / aspect_ratio) }; + } if (input_width > max_width) return { max_width, max(max_width / aspect_ratio, min_height) };