Fix potential NRE on some bare bones windows installs while trying to match fonts using skia sharp

bcssov · bcssov · commit febe8ac87b6d · 2026-01-24T04:12:39.000+01:00
diff --git a/src/IronyModManager.Platform/Fonts/FontManager.cs b/src/IronyModManager.Platform/Fonts/FontManager.cs
@@ -4,13 +4,14 @@
 // Created          : 03-13-2021
 //
 // Last Modified By : Mario
-// Last Modified On : 10-27-2021
+// Last Modified On : 01-24-2026
 // ***********************************************************************
 // <copyright file="FontManager.cs" company="Mario">
 //     Mario
 // </copyright>
 // <summary></summary>
 // ***********************************************************************
+
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -51,7 +52,7 @@ internal class FontManager : IFontManagerImpl
         /// <summary>
         /// All fonts
         /// </summary>
-        private List<string> allFonts = null;
+        private List<string> allFonts;
 
         /// <summary>
         /// The typefaces
@@ -90,18 +91,21 @@ public IGlyphTypefaceImpl CreateGlyphTypeface(Typeface typeface)
                 {
                     typeface = new Typeface(fontFamilyManager.ResolveFontFamily(typeface.FontFamily.Name).GetFontFamily(), typeface.Style, typeface.Weight);
                 }
+
                 var fontCollection = SKTypefaceCollectionCache.GetOrAddTypefaceCollection(typeface.FontFamily);
                 if (fontCollection == null)
                 {
                     // Fallback to Irony default
                     typeface = new Typeface(fontFamilyManager.GetDefaultFontFamily().GetFontFamily(), typeface.Style, typeface.Weight);
                     fontCollection = SKTypefaceCollectionCache.GetOrAddTypefaceCollection(typeface.FontFamily);
                 }
+
                 var skTypeface = fontCollection.Get(typeface);
                 if (skTypeface == null)
                 {
                     return fontManager.CreateGlyphTypeface(typeface);
                 }
+
                 var isFakeBold = (int)typeface.Weight >= 600 && !skTypeface.IsBold;
                 var isFakeItalic = typeface.Style == FontStyle.Italic && !skTypeface.IsItalic;
                 return new GlyphTypefaceImpl(skTypeface, isFakeBold, isFakeItalic);
@@ -115,10 +119,12 @@ public IGlyphTypefaceImpl CreateGlyphTypeface(Typeface typeface)
                 {
                     return fontManager.CreateGlyphTypeface(typeface);
                 }
+
                 var isFakeBold = (int)typeface.Weight >= 600 && !skTypeface.IsBold;
                 var isFakeItalic = typeface.Style == FontStyle.Italic && !skTypeface.IsItalic;
                 return new GlyphTypefaceImpl(skTypeface, isFakeBold, isFakeItalic);
             }
+
             return fontManager.CreateGlyphTypeface(typeface);
         }
 
@@ -149,8 +155,10 @@ public IEnumerable<string> GetInstalledFontFamilyNames(bool checkForUpdates = fa
                 {
                     fonts.AddRange(fontManager.GetInstalledFontFamilyNames(checkForUpdates));
                 }
+
                 allFonts = fonts.Distinct().ToList();
             }
+
             return allFonts;
         }
 
@@ -168,28 +176,46 @@ public bool TryMatchCharacter(int codepoint, FontStyle fontStyle, FontWeight fon
         {
             if (typefaces == null)
             {
-                typefaces = new List<Typeface>();
+                typefaces = [];
                 foreach (var item in fontFamilyManager.GetAllFontNames())
                 {
                     typefaces.Add(new Typeface(fontFamilyManager.ResolveFontFamily(item).GetFontFamily()));
                 }
             }
+
             foreach (var item in typefaces)
             {
                 if (item.GlyphTypeface.GetGlyph((uint)codepoint) == 0)
                 {
                     continue;
                 }
+
                 typeface = new Typeface(item.FontFamily.Name, fontStyle, fontWeight);
                 return true;
             }
 
             if (GetPlatformConfiguration().GetOptions().Fonts.UseInbuiltFontsOnly)
             {
-                var fallback = SKFontManager.Default.MatchCharacter(fontFamily?.Name, (SKFontStyleWeight)fontWeight, SKFontStyleWidth.Normal, (SKFontStyleSlant)fontStyle, new string[] { culture.ThreeLetterISOLanguageName, culture.TwoLetterISOLanguageName }, codepoint);
+                SKTypeface fallback = null;
+                if (SKFontManager.Default != null)
+                {
+                    // Some OS / Skia builds can throw or return null from SKFontManager.Default.MatchCharacter.
+                    // Guard and fallback to Irony's bundled default font to avoid UI crashes.
+                    try
+                    {
+                        fallback = SKFontManager.Default.MatchCharacter(fontFamily?.Name, (SKFontStyleWeight)fontWeight, SKFontStyleWidth.Normal, (SKFontStyleSlant)fontStyle, [
+                            culture.ThreeLetterISOLanguageName, culture.TwoLetterISOLanguageName
+                        ], codepoint);
+                    }
+                    catch
+                    {
+                    }
+                }
+
                 typeface = new Typeface(fallback?.FamilyName ?? fontFamilyManager.GetDefaultFontFamily().GetFontFamily(), fontStyle, fontWeight);
                 return true;
             }
+
             return fontManager.TryMatchCharacter(codepoint, fontStyle, fontWeight, fontFamily, culture, out typeface);
         }
 
@@ -199,10 +225,8 @@ public bool TryMatchCharacter(int codepoint, FontStyle fontStyle, FontWeight fon
         /// <returns>IFontFamilyManager.</returns>
         private IFontFamilyManager GetFontFamilyManager()
         {
-            if (fontFamilyManager == null)
-            {
-                fontFamilyManager = DIResolver.Get<IFontFamilyManager>();
-            }
+            fontFamilyManager ??= DIResolver.Get<IFontFamilyManager>();
+
             return fontFamilyManager;
         }
 
@@ -212,10 +236,8 @@ private IFontFamilyManager GetFontFamilyManager()
         /// <returns>IPlatformConfiguration.</returns>
         private IPlatformConfiguration GetPlatformConfiguration()
         {
-            if (platformConfiguration == null)
-            {
-                platformConfiguration = DIResolver.Get<IPlatformConfiguration>();
-            }
+            platformConfiguration ??= DIResolver.Get<IPlatformConfiguration>();
+
             return platformConfiguration;
         }
 
diff --git a/src/IronyModManager.Platform/Fonts/SKTypefaceCollectionCache.cs b/src/IronyModManager.Platform/Fonts/SKTypefaceCollectionCache.cs
@@ -4,16 +4,18 @@
 // Created          : 03-13-2021
 //
 // Last Modified By : Mario
-// Last Modified On : 07-10-2022
+// Last Modified On : 01-24-2026
 // ***********************************************************************
 // <copyright file="SKTypefaceCollectionCache.cs" company="Avalonia">
 //     Avalonia
 // </copyright>
 // <summary></summary>
 // ***********************************************************************
+
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Avalonia;
 using Avalonia.Media;
@@ -27,6 +29,7 @@ namespace IronyModManager.Platform.Fonts
     /// <summary>
     /// Class SKTypefaceCollectionCache.
     /// </summary>
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
     internal static class SKTypefaceCollectionCache
     {
         #region Fields
@@ -59,7 +62,7 @@ static SKTypefaceCollectionCache()
         /// <returns>SKTypefaceCollection.</returns>
         public static SKTypefaceCollection GetOrAddTypefaceCollection(FontFamily fontFamily)
         {
-            return cachedCollections.GetOrAdd(fontFamily, x => CreateCustomFontCollection(fontFamily));
+            return cachedCollections.GetOrAdd(fontFamily, _ => CreateCustomFontCollection(fontFamily));
         }
 
         /// <summary>
@@ -68,7 +71,6 @@ public static SKTypefaceCollection GetOrAddTypefaceCollection(FontFamily fontFam
         /// <param name="fontFamily">The font family.</param>
         /// <returns>SKTypefaceCollection.</returns>
         /// <exception cref="System.InvalidOperationException">Asset could not be loaded.</exception>
-
         private static SKTypefaceCollection CreateCustomFontCollection(FontFamily fontFamily)
         {
             var fontAssets = FontFamilyLoader.LoadFontAssets(fontFamily.Key);

Original file line number	Diff line number	Diff line change
`@@ -4,13 +4,14 @@`
`4`	`4`	`// Created : 03-13-2021`
`5`	`5`	`//`
`6`	`6`	`// Last Modified By : Mario`
`7`		`-// Last Modified On : 10-27-2021`
	`7`	`+// Last Modified On : 01-24-2026`
`8`	`8`	`// ***********************************************************************`
`9`	`9`	`// <copyright file="FontManager.cs" company="Mario">`
`10`	`10`	`// Mario`
`11`	`11`	`// </copyright>`
`12`	`12`	`// <summary></summary>`
`13`	`13`	`// ***********************************************************************`
	`14`	`+`
`14`	`15`	`using System;`
`15`	`16`	`using System.Collections.Generic;`
`16`	`17`	`using System.Globalization;`
`@@ -51,7 +52,7 @@ internal class FontManager : IFontManagerImpl`
`51`	`52`	`/// <summary>`
`52`	`53`	`/// All fonts`
`53`	`54`	`/// </summary>`
`54`		`- private List<string> allFonts = null;`
	`55`	`+ private List<string> allFonts;`
`55`	`56`
`56`	`57`	`/// <summary>`
`57`	`58`	`/// The typefaces`
`@@ -90,18 +91,21 @@ public IGlyphTypefaceImpl CreateGlyphTypeface(Typeface typeface)`
`90`	`91`	`{`
`91`	`92`	`typeface = new Typeface(fontFamilyManager.ResolveFontFamily(typeface.FontFamily.Name).GetFontFamily(), typeface.Style, typeface.Weight);`
`92`	`93`	`}`
	`94`	`+`
`93`	`95`	`var fontCollection = SKTypefaceCollectionCache.GetOrAddTypefaceCollection(typeface.FontFamily);`
`94`	`96`	`if (fontCollection == null)`
`95`	`97`	`{`
`96`	`98`	`// Fallback to Irony default`
`97`	`99`	`typeface = new Typeface(fontFamilyManager.GetDefaultFontFamily().GetFontFamily(), typeface.Style, typeface.Weight);`
`98`	`100`	`fontCollection = SKTypefaceCollectionCache.GetOrAddTypefaceCollection(typeface.FontFamily);`
`99`	`101`	`}`
	`102`	`+`
`100`	`103`	`var skTypeface = fontCollection.Get(typeface);`
`101`	`104`	`if (skTypeface == null)`
`102`	`105`	`{`
`103`	`106`	`return fontManager.CreateGlyphTypeface(typeface);`
`104`	`107`	`}`
	`108`	`+`
`105`	`109`	`var isFakeBold = (int)typeface.Weight >= 600 && !skTypeface.IsBold;`
`106`	`110`	`var isFakeItalic = typeface.Style == FontStyle.Italic && !skTypeface.IsItalic;`
`107`	`111`	`return new GlyphTypefaceImpl(skTypeface, isFakeBold, isFakeItalic);`
`@@ -115,10 +119,12 @@ public IGlyphTypefaceImpl CreateGlyphTypeface(Typeface typeface)`
`115`	`119`	`{`
`116`	`120`	`return fontManager.CreateGlyphTypeface(typeface);`
`117`	`121`	`}`
	`122`	`+`
`118`	`123`	`var isFakeBold = (int)typeface.Weight >= 600 && !skTypeface.IsBold;`
`119`	`124`	`var isFakeItalic = typeface.Style == FontStyle.Italic && !skTypeface.IsItalic;`
`120`	`125`	`return new GlyphTypefaceImpl(skTypeface, isFakeBold, isFakeItalic);`
`121`	`126`	`}`
	`127`	`+`
`122`	`128`	`return fontManager.CreateGlyphTypeface(typeface);`
`123`	`129`	`}`
`124`	`130`
`@@ -149,8 +155,10 @@ public IEnumerable<string> GetInstalledFontFamilyNames(bool checkForUpdates = fa`
`149`	`155`	`{`
`150`	`156`	`fonts.AddRange(fontManager.GetInstalledFontFamilyNames(checkForUpdates));`
`151`	`157`	`}`
	`158`	`+`
`152`	`159`	`allFonts = fonts.Distinct().ToList();`
`153`	`160`	`}`
	`161`	`+`
`154`	`162`	`return allFonts;`
`155`	`163`	`}`
`156`	`164`
`@@ -168,28 +176,46 @@ public bool TryMatchCharacter(int codepoint, FontStyle fontStyle, FontWeight fon`
`168`	`176`	`{`
`169`	`177`	`if (typefaces == null)`
`170`	`178`	`{`
`171`		`- typefaces = new List<Typeface>();`
	`179`	`+ typefaces = [];`
`172`	`180`	`foreach (var item in fontFamilyManager.GetAllFontNames())`
`173`	`181`	`{`
`174`	`182`	`typefaces.Add(new Typeface(fontFamilyManager.ResolveFontFamily(item).GetFontFamily()));`
`175`	`183`	`}`
`176`	`184`	`}`
	`185`	`+`
`177`	`186`	`foreach (var item in typefaces)`
`178`	`187`	`{`
`179`	`188`	`if (item.GlyphTypeface.GetGlyph((uint)codepoint) == 0)`
`180`	`189`	`{`
`181`	`190`	`continue;`
`182`	`191`	`}`
	`192`	`+`
`183`	`193`	`typeface = new Typeface(item.FontFamily.Name, fontStyle, fontWeight);`
`184`	`194`	`return true;`
`185`	`195`	`}`
`186`	`196`
`187`	`197`	`if (GetPlatformConfiguration().GetOptions().Fonts.UseInbuiltFontsOnly)`
`188`	`198`	`{`
`189`		`- var fallback = SKFontManager.Default.MatchCharacter(fontFamily?.Name, (SKFontStyleWeight)fontWeight, SKFontStyleWidth.Normal, (SKFontStyleSlant)fontStyle, new string[] { culture.ThreeLetterISOLanguageName, culture.TwoLetterISOLanguageName }, codepoint);`
	`199`	`+ SKTypeface fallback = null;`
	`200`	`+ if (SKFontManager.Default != null)`
	`201`	`+ {`
	`202`	`+ // Some OS / Skia builds can throw or return null from SKFontManager.Default.MatchCharacter.`
	`203`	`+ // Guard and fallback to Irony's bundled default font to avoid UI crashes.`
	`204`	`+ try`
	`205`	`+ {`
	`206`	`+ fallback = SKFontManager.Default.MatchCharacter(fontFamily?.Name, (SKFontStyleWeight)fontWeight, SKFontStyleWidth.Normal, (SKFontStyleSlant)fontStyle, [`
	`207`	`+ culture.ThreeLetterISOLanguageName, culture.TwoLetterISOLanguageName`
	`208`	`+ ], codepoint);`
	`209`	`+ }`
	`210`	`+ catch`
	`211`	`+ {`
	`212`	`+ }`
	`213`	`+ }`
	`214`	`+`
`190`	`215`	`typeface = new Typeface(fallback?.FamilyName ?? fontFamilyManager.GetDefaultFontFamily().GetFontFamily(), fontStyle, fontWeight);`
`191`	`216`	`return true;`
`192`	`217`	`}`
	`218`	`+`
`193`	`219`	`return fontManager.TryMatchCharacter(codepoint, fontStyle, fontWeight, fontFamily, culture, out typeface);`
`194`	`220`	`}`
`195`	`221`
`@@ -199,10 +225,8 @@ public bool TryMatchCharacter(int codepoint, FontStyle fontStyle, FontWeight fon`
`199`	`225`	`/// <returns>IFontFamilyManager.</returns>`
`200`	`226`	`private IFontFamilyManager GetFontFamilyManager()`
`201`	`227`	`{`
`202`		`- if (fontFamilyManager == null)`
`203`		`- {`
`204`		`- fontFamilyManager = DIResolver.Get<IFontFamilyManager>();`
`205`		`- }`
	`228`	`+ fontFamilyManager ??= DIResolver.Get<IFontFamilyManager>();`
	`229`	`+`
`206`	`230`	`return fontFamilyManager;`
`207`	`231`	`}`
`208`	`232`
`@@ -212,10 +236,8 @@ private IFontFamilyManager GetFontFamilyManager()`
`212`	`236`	`/// <returns>IPlatformConfiguration.</returns>`
`213`	`237`	`private IPlatformConfiguration GetPlatformConfiguration()`
`214`	`238`	`{`
`215`		`- if (platformConfiguration == null)`
`216`		`- {`
`217`		`- platformConfiguration = DIResolver.Get<IPlatformConfiguration>();`
`218`		`- }`
	`239`	`+ platformConfiguration ??= DIResolver.Get<IPlatformConfiguration>();`
	`240`	`+`
`219`	`241`	`return platformConfiguration;`
`220`	`242`	`}`
`221`	`243`