1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

macOS + FreeType: fix crash with non printable unicode

Browse Source 
Task-number: QTBUG-84096
Change-Id: Ia60b7094ef9e82cf24f5a8b7995000ae65bb379a
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit ebfd0b14aadc8d7e1415fa6a698038dffd251cb0)
Reviewed-by: Anton Kudryavtsev <antkudr@mail.ru>
This commit is contained in:
Anton Kudryavtsev 2020-10-30 11:16:57 +03:00
parent 208979ed01
commit 435f853ae3
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
View File

@ -376,7 +376,10 @@ QFontEngine *QCoreTextFontDatabaseEngineFactory<QFontEngineFT>::fontEngine(const
faceId.filename = QString::fromNSString(url.path).toUtf8();
return QFontEngineFT::create(fontDef, faceId);
}
Q_UNREACHABLE();
// We end up here with a descriptor does not contain Qt font data or kCTFontURLAttribute.
// Since the FT engine can't deal with a descriptor with just a NSFontNameAttribute,
// we should return nullptr.
return nullptr;
}
#endif