f2a26f5bbb
Resolves: CVE-2022-2601 Signed-off-by: Robbie Harwood <rharwood@redhat.com>
42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 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] 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>
|
|
(cherry picked from commit 25ad31c19c331aaa2dbd9bd2b2e2655de5766a9d)
|
|
(cherry picked from commit ad950e1e033318bb50222ed268a6dcfb97389035)
|
|
---
|
|
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 1fa181d4ca..a115a63b0c 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,
|