corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1959560: Prevent crashes on macOS when font names cannot be retrieved. r=gfx-reviewers,bradwerth

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D245182
This commit is contained in:
Stephen A Pohl
2025-04-11 11:18:44 +00:00
parent 815536bfb7
commit dee91b864e
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gfx/thebes/CoreTextFontList.cpp
View File

@@ -1455,16 +1455,17 @@ gfxFontEntry* CoreTextFontList::LookupLocalFont(
return nullptr;
}
AutoCFRelease<CFStringRef> name = CTFontCopyFamilyName(ctFont);
// Convert the family name to a key suitable for font-list lookup (8-bit,
// lowercased).
nsAutoCString key;
// CFStringGetLength is in UTF-16 code units. The maximum this count can
// expand when converted to UTF-8 is 3x. We add 1 to ensure there will also be
// space for null-termination of the resulting C string.
key.SetLength((CFStringGetLength(name) + 1) * 3);
if (!CFStringGetCString(name, key.BeginWriting(), key.Length(),
kCFStringEncodingUTF8)) {
if (name) {
// CFStringGetLength is in UTF-16 code units. The maximum this count can
// expand when converted to UTF-8 is 3x. We add 1 to ensure there will also
// be space for null-termination of the resulting C string.
key.SetLength((CFStringGetLength(name) + 1) * 3);
}
if (!name || !CFStringGetCString(name, key.BeginWriting(), key.Length(),
kCFStringEncodingUTF8)) {
// This shouldn't ever happen, but if it does we just bail.
NS_WARNING("Failed to get family name?");
key.Truncate(0);