From ebfd0b14aadc8d7e1415fa6a698038dffd251cb0 Mon Sep 17 00:00:00 2001 From: Anton Kudryavtsev Date: Fri, 30 Oct 2020 11:16:57 +0300 Subject: [PATCH] macOS + FreeType: fix crash with non printable unicode MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-84096 Pick-to: 5.15 Pick-to: 5.12 Change-Id: Ia60b7094ef9e82cf24f5a8b7995000ae65bb379a Reviewed-by: Tor Arne Vestbø --- src/gui/text/coretext/qcoretextfontdatabase.mm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gui/text/coretext/qcoretextfontdatabase.mm b/src/gui/text/coretext/qcoretextfontdatabase.mm index ba3c2424d02..ee145a03d54 100644 --- a/src/gui/text/coretext/qcoretextfontdatabase.mm +++ b/src/gui/text/coretext/qcoretextfontdatabase.mm @@ -406,7 +406,10 @@ QFontEngine *QCoreTextFontDatabaseEngineFactory::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