From 34d2382d93bd82beb0cccf538e25dafe7a2c3d0a Mon Sep 17 00:00:00 2001 From: Yuri Strot Date: Mon, 13 May 2019 19:36:55 +0700 Subject: [PATCH] Avoid NPE mentioned in #571: LoadFont with "bold" weight will crash --- Source/render/RenderUtils.swift | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/render/RenderUtils.swift b/Source/render/RenderUtils.swift index 3d559893..1b7231d7 100644 --- a/Source/render/RenderUtils.swift +++ b/Source/render/RenderUtils.swift @@ -58,7 +58,9 @@ class RenderUtils { let lowerWeight = weight?.lowercased() if lowerWeight == "bold" || lowerWeight == "bolder" { #if os(iOS) - fontDesc = fontDesc.withSymbolicTraits(.traitBold)! + if let boldDesc = fontDesc.withSymbolicTraits(.traitBold) { + fontDesc = boldDesc + } #elseif os(OSX) fontDesc = fontDesc.withSymbolicTraits(.bold) #endif