Fix crash when no valid Typeface::Ptr can be resolved

Merged from JUCE commit: ba61c9e

Author: anjaldoshi

JuceLibraryCode/modules/juce_graphics/fonts/juce_Font.cpp

@@ -105,6 +105,15 @@ class TypefaceCache final : private DeletedAtShutdown
 
         const ScopedWriteLock slw (lock);
 
+        auto newFace = CachedFace { key,
+                                    ++counter,
+                                    juce_getTypefaceForFont != nullptr
+                                        ? juce_getTypefaceForFont (font)
+                                        : Font::getDefaultTypefaceForFont (font) };
+
+        if (newFace.typeface == nullptr)
+            return nullptr;
+
         const auto replaceIter = std::min_element (faces.begin(),
                                                    faces.end(),
                                                    [] (const auto& a, const auto& b)
@@ -114,13 +123,8 @@ class TypefaceCache final : private DeletedAtShutdown
 
         jassert (replaceIter != faces.end());
         auto& face = *replaceIter;
-        face = CachedFace { key,
-                            ++counter,
-                            juce_getTypefaceForFont != nullptr
-                                ? juce_getTypefaceForFont (font)
-                                : Font::getDefaultTypefaceForFont (font) };
 
-        jassert (face.typeface != nullptr); // the look and feel must return a typeface!
+        face = std::move (newFace);
 
         if (defaultFace == nullptr && key == Key{})
             defaultFace = face.typeface;
@@ -208,10 +212,7 @@ class Font::SharedFontInternal  : public ReferenceCountedObject
         const ScopedLock lock (mutex);
 
         if (typeface == nullptr)
-        {
             typeface = options.getTypeface() != nullptr ? options.getTypeface() : TypefaceCache::getInstance()->findTypefaceFor (f);
-            jassert (typeface != nullptr);
-        }
 
         return typeface;
     }
@@ -765,8 +766,13 @@ int Font::getStringWidth (const String& text) const
 
 float Font::getStringWidthFloat (const String& text) const
 {
-    const auto w = getTypefacePtr()->getStringWidth (getMetricsKind(), text, getHeight(), getHorizontalScale());
-    return w + (getHeight() * getHorizontalScale() * getExtraKerningFactor() * (float) text.length());
+    if (auto typeface = getTypefacePtr())
+    {
+        const auto w = typeface->getStringWidth (getMetricsKind(), text, getHeight(), getHorizontalScale());
+        return w + (getHeight() * getHorizontalScale() * getExtraKerningFactor() * (float) text.length());
+    }
+
+    return 0;
 }
 
 void Font::findFonts (Array<Font>& destArray)
@@ -834,9 +840,19 @@ Font Font::findSuitableFontForText (const String& text, const String& language)
             return copy;
     }
 
-    if (auto current = getTypefacePtr())
+    const auto fallbackTypefacePtr = std::invoke ([&]
+    {
+        if (auto current = getTypefacePtr())
+            return current;
+
+        auto copy = *this;
+        copy.setTypefaceName (Font::getDefaultSansSerifFontName());
+        return copy.getTypefacePtr();
+    });
+
+    if (fallbackTypefacePtr != nullptr)
     {
-        if (auto suggested = current->createSystemFallback (text, language))
+        if (auto suggested = fallbackTypefacePtr->createSystemFallback (text, language))
         {
             auto copy = *this;
 
@@ -1022,4 +1038,4 @@ static FontTests fontTests;
 
 #endif
 
-} // namespace juce
+} // namespace juce

JuceLibraryCode/modules/juce_graphics/fonts/juce_SimpleShapedText.cpp

@@ -467,10 +467,7 @@ static std::vector<ShapedGlyph> lowLevelShape (const String& string,
     auto nativeFont = font.getNativeDetails().font;
 
     if (nativeFont == nullptr)
-    {
-        jassertfalse;
         return {};
-    }
 
     hb_shape (nativeFont.get(), buffer.get(), features.data(), (unsigned int) features.size());