0ct0pu5/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions2

LibGfx: Handle UTF-16-encoded OpenType font names

Browse source 
This change makes OpenType::Name::string_for_id handle fonts whose names
are UTF-16-encoded (along with handling UTF-8-encoded names).

Otherwise, without this change, the existing code assumes the names are
UTF-8-encoded, fails gracelessly if they’re not, and crashes.

Fixes https://github.com/LadybirdBrowser/ladybird/issues/75
This commit is contained in:
sideshowbarker 2024-07-20 19:36:46 +09:00 • committed by Sam Atkins
parent 3faff34bf6
commit 1a9dabe5ff
Notes: github-actions[bot] 2024-07-20 11:41:54 +00:00
1 changed files with 8 additions and 6 deletions

14
Userland/Libraries/LibGfx/Font/OpenType/Tables.cpp
View file

@ -229,18 +229,20 @@ String Name::string_for_id(NameId id) const
auto const platform_id = name_record.platform_id;
auto const length = name_record.length;
auto const offset = name_record.string_offset;
auto const name_bytes = m_string_data.slice(offset, length);
if (platform_id == to_underlying(Platform::Windows)) {
static auto& decoder = *TextCodec::decoder_for("utf-16be"sv);
return decoder.to_utf8(m_string_data.slice(offset, length)).release_value_but_fixme_should_propagate_errors();
return decoder.to_utf8(name_bytes).release_value_but_fixme_should_propagate_errors();
}
auto maybe_name = String::from_utf8(m_string_data.slice(offset, length));
auto maybe_name = String::from_utf8(name_bytes);
if (maybe_name.is_error()) {
// FIXME: https://github.com/LadybirdBrowser/ladybird/issues/75
// This seems related to fonts that don't have a Latin script name in their family field.
// Perhaps we shouldn't be assuming these are UTF-8 encoded?
dbgln("OpenType::Name: Failed to decode name string as UTF-8");
static auto& decoder = *TextCodec::decoder_for("utf-16be"sv);
maybe_name = decoder.to_utf8(name_bytes);
if (!maybe_name.is_error())
return maybe_name.release_value_but_fixme_should_propagate_errors();
dbgln("OpenType::Name: Failed to decode name string as UTF-8 or UTF-16BE");
return String {};
}
return maybe_name.release_value();