Blame SOURCES/0290-font-Assign-null_font-to-glyphs-in-ascii_font_glyph.patch

fd0330
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
fd0330
From: Zhang Boyang <zhangboyang.id@gmail.com>
fd0330
Date: Fri, 28 Oct 2022 17:29:16 +0800
fd0330
Subject: [PATCH] font: Assign null_font to glyphs in ascii_font_glyph[]
fd0330
fd0330
The calculations in blit_comb() need information from glyph's font, e.g.
fd0330
grub_font_get_xheight(main_glyph->font). However, main_glyph->font is
fd0330
NULL if main_glyph comes from ascii_font_glyph[]. Therefore
fd0330
grub_font_get_*() crashes because of NULL pointer.
fd0330
fd0330
There is already a solution, the null_font. So, assign it to those glyphs
fd0330
in ascii_font_glyph[].
fd0330
fd0330
Reported-by: Daniel Axtens <dja@axtens.net>
fd0330
Signed-off-by: Zhang Boyang <zhangboyang.id@gmail.com>
fd0330
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
fd0330
(cherry picked from commit dd539d695482069d28b40f2d3821f710cdcf6ee6)
fd0330
---
fd0330
 grub-core/font/font.c | 2 +-
fd0330
 1 file changed, 1 insertion(+), 1 deletion(-)
fd0330
fd0330
diff --git a/grub-core/font/font.c b/grub-core/font/font.c
fd0330
index 29fbb94294..e6616e610c 100644
fd0330
--- a/grub-core/font/font.c
fd0330
+++ b/grub-core/font/font.c
fd0330
@@ -137,7 +137,7 @@ ascii_glyph_lookup (grub_uint32_t code)
fd0330
 	  ascii_font_glyph[current]->offset_x = 0;
fd0330
 	  ascii_font_glyph[current]->offset_y = -2;
fd0330
 	  ascii_font_glyph[current]->device_width = 8;
fd0330
-	  ascii_font_glyph[current]->font = NULL;
fd0330
+	  ascii_font_glyph[current]->font = &null_font;
fd0330
 
fd0330
 	  grub_memcpy (ascii_font_glyph[current]->bitmap,
fd0330
 		       &ascii_bitmaps[current * ASCII_BITMAP_SIZE],