arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-14 02:18:07 +00:00
Code Issues Releases Wiki Activity

fixup! refactor(core): safe iface for get_glyph_data

Browse Source
This commit is contained in:
obrusvit 2024-12-13 15:36:39 +01:00
parent 80fa6c254d
commit 74a84516f9
1 changed files with 47 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
core/embed/rust/src/ui/display/font.rs
View File

@ -46,6 +46,8 @@ impl<'a> Glyph<'a> {
let width = data[0] as i16; let width = data[0] as i16;
let height = data[1] as i16; let height = data[1] as i16;
let size = calculate_glyph_size(data);
ensure!(data.len() == size, "Invalid glyph data size");
Glyph { Glyph {
width, width,
height, height,
@ -144,8 +146,55 @@ impl GlyphData {
}; };
let gl_data = self.get_glyph_data(ch as u16); let gl_data = self.get_glyph_data(ch as u16);
ensure!(gl_data.is_some(), "Failed to load glyph"); Glyph::load(unwrap!(gl_data, "Failed to load glyph"))
Glyph::load(gl_data.unwrap()) }
fn get_glyph_data(&self, codepoint: u16) -> Option<&[u8]> {
display::get_font_info(self.font.into()).map(|font_info| {
if codepoint >= ' ' as u16 && codepoint < 0x7F {
// ASCII character
let offset = codepoint - ' ' as u16;
unsafe {
let ptr = *font_info.glyph_data.offset(offset as isize);
self.load_glyph_from_ptr(ptr)
}
} else {
#[cfg(feature = "translations")]
{
if codepoint >= 0x7F {
// UTF8 character from embedded blob
if let Some(glyph) = self
.translations_guard
.as_ref()
.and_then(|guard| guard.as_ref())
.and_then(|translations| {
translations.get_utf8_glyph(codepoint, self.font as u16)
})
{
return glyph;
}
}
}
self.glyph_nonprintable()
}
})
}
/// Returns glyph data slice from a raw pointer by reading the header and calculating full size.
unsafe fn load_glyph_from_ptr(&self, ptr: *const u8) -> &[u8] {
unsafe {
let header = slice::from_raw_parts(ptr, 2);
let full_size = calculate_glyph_size(header);
slice::from_raw_parts(ptr, full_size)
}
}
/// Returns glyph data slize for non-printable characters.
fn glyph_nonprintable(&self) -> &[u8] {
display::get_font_info(self.font.into())
.map(|font_info| unsafe { self.load_glyph_from_ptr(font_info.glyph_nonprintable) })
.unwrap()
}
} }
fn calculate_glyph_size(header: &[u8]) -> usize { fn calculate_glyph_size(header: &[u8]) -> usize {
@ -163,45 +212,6 @@ impl GlyphData {
5 + data_bytes as usize // header (5 bytes) + bitmap data 5 + data_bytes as usize // header (5 bytes) + bitmap data
} }
fn get_glyph_data(&self, codepoint: u16) -> Option<&[u8]> {
display::get_font_info(self.font.into()).map(|font_info| {
if codepoint >= ' ' as u16 && codepoint < 0x7F {
// ASCII character
unsafe {
let ptr = *font_info
.glyph_data
.offset((codepoint - ' ' as u16) as isize);
let header = slice::from_raw_parts(ptr, 2);
let full_size = Self::calculate_glyph_size(header);
slice::from_raw_parts(ptr, full_size)
}
} else {
#[cfg(feature = "translations")]
{
if codepoint >= 0x7F {
// UTF8 character from embedded blob
if let Some(guard) = &self.translations_guard {
if let Some(translations) = guard.as_ref() {
if let Some(glyph) =
translations.get_utf8_glyph(codepoint, self.font as u16)
{
return glyph;
}
}
}
}
}
unsafe {
let ptr = font_info.glyph_nonprintable;
let header = slice::from_raw_parts(ptr, 2);
let full_size = Self::calculate_glyph_size(header);
slice::from_raw_parts(ptr, full_size)
}
}
})
}
}
/// Font constants. Keep in sync with `font_id_t` definition in /// Font constants. Keep in sync with `font_id_t` definition in
/// `core/embed/gfx/fonts/fonts.h`. /// `core/embed/gfx/fonts/fonts.h`.
#[derive(Copy, Clone, PartialEq, Eq, FromPrimitive)] #[derive(Copy, Clone, PartialEq, Eq, FromPrimitive)]