diff options
| author | Anton Kudryavtsev <anton.kudryavtsev@corp.mail.ru> | 2020-10-30 11:16:57 +0300 |
|---|---|---|
| committer | Anton Kudryavtsev <anton.kudryavtsev@corp.mail.ru> | 2020-11-05 17:33:59 +0300 |
| commit | 435f853ae3c3b174ce261fa4b8123bf1088d41c7 (patch) | |
| tree | 72882d19018c52be22ff85b8b74d36abf8d2ee95 | |
| parent | 208979ed0126a31e48b435ef62bc9bac4db561f3 (diff) | |
macOS + FreeType: fix crash with non printable unicode
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>
| -rw-r--r-- | src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm index a52e157768..83629004fa 100644 --- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm +++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm @@ -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 |