Fixed a crash when opening certain fonts (#40)

ArtSabintsev · Feb 1, 2022 · 7124bf8 · 7124bf8
1 parent cc8ef15
commit 7124bf8
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/Sources/FontBlaster.swift b/Sources/FontBlaster.swift
@@ -100,10 +100,13 @@ private extension FontBlaster {
         if let fontData = try? Data(contentsOf: fontFileURL) as CFData,
             let dataProvider = CGDataProvider(data: fontData) {
 
-            let fontRef = CGFont(dataProvider)
+            guard let fontRef = CGFont(dataProvider) else {
+                printDebugMessage(message: "Failed to load font: '\(fontName)': fontRef is nil")
+                return
+            }
 
-            if CTFontManagerRegisterGraphicsFont(fontRef!, &fontError),
-               let postScriptName = fontRef?.postScriptName {
+            if CTFontManagerRegisterGraphicsFont(fontRef, &fontError),
+               let postScriptName = fontRef.postScriptName {
                     printDebugMessage(message: "Successfully loaded font: '\(postScriptName)'.")
                     loadedFonts.append(String(postScriptName))
             } else if let fontError = fontError?.takeRetainedValue() {