FIX - NullReferenceException caused by bad langtag #387

turquoiseowl · Aug 14, 2019 · c418e33 · c418e33
1 parent a76406e
commit c418e33
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/i18n/Concrete/TextLocalizer.cs b/src/i18n/Concrete/TextLocalizer.cs
@@ -126,6 +126,9 @@ private bool IsLanguageValid(string langtag)
         {
         // Note that there is no need to serialize access to System.Web.HttpRuntime.Cache when just reading from it.
         //
+            if (!langtag.IsSet()) {
+                return false; }
+
             // Default language is always valid.
             if (LocalizedApplication.Current.MessageKeyIsValueInDefaultLanguage
                 && LocalizedApplication.Current.DefaultLanguageTag.Equals(langtag)) {

diff --git a/src/i18n/LocalizedApplication.cs b/src/i18n/LocalizedApplication.cs
@@ -118,10 +118,12 @@ public string DefaultLanguage
             }
             set
             {
-                DefaultLanguageTag = LanguageTag.GetCachedInstance(value);
+                LanguageTag defaultLanguageTag = LanguageTag.GetCachedInstance(value);
+                if (defaultLanguageTag != null) {
+                    DefaultLanguageTag = defaultLanguageTag; }
             }
         }
-        public LanguageTag DefaultLanguageTag { get; set; }
+        public LanguageTag DefaultLanguageTag { get; private set; }
 
         /// <summary>
         /// Specifies whether the key for a message may be assumed to be the value for