From 6f57537f30b76bd80a33492f5a3c7018a13c6369 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 18 Feb 2025 18:44:57 +0530
Subject: [PATCH] Fix failing test

---
 kitty/fonts.c        | 7 ++++---
 kitty_tests/fonts.py | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/kitty/fonts.c b/kitty/fonts.c
index 125ecac4a..7f4d3e721 100644
--- a/kitty/fonts.c
+++ b/kitty/fonts.c
@@ -179,7 +179,7 @@ ensure_canvas_can_fit(FontGroup *fg, unsigned cells, unsigned scale) {
     size_in_bytes = (sizeof(fg->canvas.alpha_mask[0]) * SUPERSAMPLE_FACTOR * SUPERSAMPLE_FACTOR * 2 * fg->fcm.cell_width * fg->fcm.cell_height * scale * scale);
     if (size_in_bytes > fg->canvas.alpha_mask_sz_in_bytes) {
         fg->canvas.alpha_mask_sz_in_bytes = size_in_bytes;
-        fg->canvas.alpha_mask = malloc(fg->canvas.alpha_mask_sz_in_bytes * sizeof(fg->canvas.alpha_mask[0]));
+        fg->canvas.alpha_mask = malloc(fg->canvas.alpha_mask_sz_in_bytes);
         if (!fg->canvas.alpha_mask) fatal("Out of memory allocating canvas");
     }
 }
@@ -837,7 +837,7 @@ effective_scale(RunFont rf) {
 
 static float
 scaled_cell_dimensions(RunFont rf, unsigned *width, unsigned *height) {
-    float frac = MAX(effective_scale(rf), 4.0f / *width);
+    float frac = MAX(effective_scale(rf), MIN(4.f, (float)*width) / *width);
     *width = (unsigned)ceilf(frac * *width);
     *height = (unsigned)ceilf(frac * *height);
     return frac;
@@ -1053,11 +1053,12 @@ render_box_cell(FontGroup *fg, RunFont rf, CPUCell *cpu_cell, GPUCell *gpu_cell,
         return;
     }
     float scale = apply_scale_to_font_group(fg, &rf);
+    ensure_canvas_can_fit(fg, num_glyphs + 1, rf.scale);
     FontCellMetrics scaled_metrics = fg->fcm;
     unsigned width = fg->fcm.cell_width, height = fg->fcm.cell_height;
     if (scale != 1) apply_scale_to_font_group(fg, NULL);
     uint8_t *alpha_mask = NULL;
-    ensure_canvas_can_fit(fg, num_glyphs + 1, rf.scale);
+    ensure_canvas_can_fit(fg, num_glyphs + 1, rf.scale);  // in case size is larger scale is larger
     if (num_glyphs == 1) {
         render_box_char(ch, fg->canvas.alpha_mask, width, height, fg->logical_dpi_x, fg->logical_dpi_y, scale);
         alpha_mask = fg->canvas.alpha_mask;
diff --git a/kitty_tests/fonts.py b/kitty_tests/fonts.py
index 6e18cb3f8..281fd3bd8 100644
--- a/kitty_tests/fonts.py
+++ b/kitty_tests/fonts.py
@@ -251,7 +251,7 @@ def block_helpers(s, sprites, cell_width, cell_height):
 
 class FontBaseTest(BaseTest):
 
-    font_size = 5.0
+    font_size = 16.0
     dpi = 72.
     font_name = 'FiraCode-Medium.otf'