Переглянути джерело

LibWeb: Fix division by zero in `solve_replaced_size_constraint()`

Fixes crashes that occur in Discord after clicking on a direct messages
conversation.
Aliaksandr Kalenik 1 рік тому
батько
коміт
c4f49e343a

+ 13 - 0
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 <html> at (0,0) content-size 800x16 [BFC] children: not-inline
+    BlockContainer <body> at (8,8) content-size 784x0 children: not-inline
+      BlockContainer <div> at (8,8) content-size 0x0 children: inline
+        frag 0 from SVGSVGBox start: 0, length: 0, rect: [8,8 100x100] baseline: 100
+        SVGSVGBox <svg> at (8,8) content-size 100x100 [SVG] children: not-inline
+        TextNode <#text>
+
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
+  PaintableWithLines (BlockContainer<HTML>) [0,0 800x16] overflow: [0,0 800x108]
+    PaintableWithLines (BlockContainer<BODY>) [8,8 784x0] overflow: [8,8 100x100]
+      PaintableWithLines (BlockContainer<DIV>) [8,8 0x0] overflow: [8,8 100x100]
+        SVGSVGPaintable (SVGSVGBox<svg>) [8,8 100x100]

+ 8 - 0
Tests/LibWeb/Layout/input/zero-size-replaced-box-with-aspect-ratio.html

@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<style>
+svg {
+    aspect-ratio: 1 / 1;
+    min-width: 100px;
+    min-height: 100px;
+}
+</style><div style="width: 0px; height: 0px"><svg xmlns="http://www.w3.org/2000/svg"></svg>

+ 10 - 8
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) };