forked from pool/grub2
fd4fd3a935
- Security fixes and hardenings * 0001-font-Reject-glyphs-exceeds-font-max_glyph_width-or-f.patch * 0002-font-Fix-size-overflow-in-grub_font_get_glyph_intern.patch - Fix CVE-2022-2601 (bsc#1205178) * 0003-font-Fix-several-integer-overflows-in-grub_font_cons.patch * 0004-font-Remove-grub_font_dup_glyph.patch * 0005-font-Fix-integer-overflow-in-ensure_comb_space.patch * 0006-font-Fix-integer-overflow-in-BMP-index.patch * 0007-font-Fix-integer-underflow-in-binary-search-of-char-.patch * 0008-fbutil-Fix-integer-overflow.patch - Fix CVE-2022-3775 (bsc#1205182) * 0009-font-Fix-an-integer-underflow-in-blit_comb.patch * 0010-font-Harden-grub_font_blit_glyph-and-grub_font_blit_.patch * 0011-font-Assign-null_font-to-glyphs-in-ascii_font_glyph.patch * 0012-normal-charset-Fix-an-integer-overflow-in-grub_unico.patch - Bump upstream SBAT generation to 3 OBS-URL: https://build.opensuse.org/request/show/1035936 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=426
43 lines
1.2 KiB
Diff
43 lines
1.2 KiB
Diff
From 9c99a0d55bf69f25ad41668867f719bbb1828457 Mon Sep 17 00:00:00 2001
|
|
From: Zhang Boyang <zhangboyang.id@gmail.com>
|
|
Date: Fri, 5 Aug 2022 02:13:29 +0800
|
|
Subject: [PATCH 04/12] font: Remove grub_font_dup_glyph()
|
|
|
|
Remove grub_font_dup_glyph() since nobody is using it since 2013, and
|
|
I'm too lazy to fix the integer overflow problem in it.
|
|
|
|
Signed-off-by: Zhang Boyang <zhangboyang.id@gmail.com>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
---
|
|
grub-core/font/font.c | 14 --------------
|
|
1 file changed, 14 deletions(-)
|
|
|
|
diff --git a/grub-core/font/font.c b/grub-core/font/font.c
|
|
index 1fa181d4c..a115a63b0 100644
|
|
--- a/grub-core/font/font.c
|
|
+++ b/grub-core/font/font.c
|
|
@@ -1055,20 +1055,6 @@ grub_font_get_glyph_with_fallback (grub_font_t font, grub_uint32_t code)
|
|
return best_glyph;
|
|
}
|
|
|
|
-#if 0
|
|
-static struct grub_font_glyph *
|
|
-grub_font_dup_glyph (struct grub_font_glyph *glyph)
|
|
-{
|
|
- static struct grub_font_glyph *ret;
|
|
- ret = grub_malloc (sizeof (*ret) + (glyph->width * glyph->height + 7) / 8);
|
|
- if (!ret)
|
|
- return NULL;
|
|
- grub_memcpy (ret, glyph, sizeof (*ret)
|
|
- + (glyph->width * glyph->height + 7) / 8);
|
|
- return ret;
|
|
-}
|
|
-#endif
|
|
-
|
|
/* FIXME: suboptimal. */
|
|
static void
|
|
grub_font_blit_glyph (struct grub_font_glyph *target,
|
|
--
|
|
2.35.3
|
|
|