From 75e85def83ca5202b91996886b59ddb815f7f0f3 Mon Sep 17 00:00:00 2001 From: Bananymous Date: Mon, 20 Mar 2023 14:59:30 +0200 Subject: [PATCH] Kernel: prefs font does not allocate extra buffer --- kernel/kernel/Font.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/kernel/kernel/Font.cpp b/kernel/kernel/Font.cpp index 043aaa95..67d5e4df 100644 --- a/kernel/kernel/Font.cpp +++ b/kernel/kernel/Font.cpp @@ -11,19 +11,17 @@ #define PSF2_HAS_UNICODE_TABLE 0x00000001 -extern char _binary_font_prefs_psf_start; -extern char _binary_font_prefs_psf_end; +extern uint8_t _binary_font_prefs_psf_start[]; +extern uint8_t _binary_font_prefs_psf_end[]; namespace Kernel { BAN::ErrorOr Font::prefs() { - size_t font_data_size = &_binary_font_prefs_psf_end - &_binary_font_prefs_psf_start; - BAN::Vector font_data; - TRY(font_data.resize(font_data_size)); - memcpy(font_data.data(), &_binary_font_prefs_psf_start, font_data_size); - return parse_psf1(font_data.span()); + size_t font_data_size = _binary_font_prefs_psf_end - _binary_font_prefs_psf_start; + BAN::Span font_data(_binary_font_prefs_psf_start, font_data_size); + return parse_psf1(font_data); } BAN::ErrorOr Font::load(BAN::StringView path)