Fix XamlDirective stack overflow exception.

Fixes dotnet#10313
ThomasGoulet73 · Jan 18, 2025 · 29cf39e · 29cf39e
1 parent b08d70d
commit 29cf39e
Showing 1 changed file with 20 additions and 25 deletions.
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Schema/MemberReflector.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Schema/MemberReflector.cs
@@ -16,7 +16,6 @@ internal class MemberReflector : Reflector
         private const DesignerSerializationVisibility VisibilityInvalid = (DesignerSerializationVisibility)int.MaxValue;
         // VisibilityNone indicates the value was looked up, and wasn't present
         private const DesignerSerializationVisibility VisibilityNone = (DesignerSerializationVisibility)(int.MaxValue - 1);
-        private static MemberReflector s_UnknownReflector;
 
         // Lazy init: check NullableReference.IsSet to determine if these fields have been initialized
         private NullableReference<string> _constructorArgument;
@@ -74,33 +73,29 @@ internal MemberReflector(XamlType type, XamlValueConverter<TypeConverter> typeCo
             _valueSerializer.Value = null;
         }
 
-        internal static MemberReflector UnknownReflector
+        internal static MemberReflector UnknownReflector { get; } = CreateUnknownReflector();
+
+        private static MemberReflector CreateUnknownReflector()
         {
-            get
+            MemberReflector unknownReflector = new MemberReflector
             {
-                if (s_UnknownReflector is null)
-                {
-                    s_UnknownReflector = new MemberReflector
-                    {
-                        _designerSerializationVisibility = DesignerSerializationVisibility.Visible,
-                        _memberBits = (int)BoolMemberBits.Default |
-                        (int)BoolMemberBits.Unknown | (int)BoolMemberBits.AllValid
-                    };
-
-                    // Explicitly set all the nullable references so that IsSet is true
-                    s_UnknownReflector._deferringLoader.Value = null;
-                    s_UnknownReflector._getter.Value = null;
-                    s_UnknownReflector._setter.Value = null;
-                    s_UnknownReflector._typeConverter.Value = null;
-                    s_UnknownReflector._valueSerializer.Value = null;
-
-                    s_UnknownReflector.DependsOn = XamlType.EmptyList<XamlMember>.Value;
-                    s_UnknownReflector.Invoker = XamlMemberInvoker.UnknownInvoker;
-                    s_UnknownReflector.Type = XamlLanguage.Object;
-                }
+                _designerSerializationVisibility = DesignerSerializationVisibility.Visible,
+                _memberBits = (int)BoolMemberBits.Default |
+                (int)BoolMemberBits.Unknown | (int)BoolMemberBits.AllValid
+            };
 
-                return s_UnknownReflector;
-            }
+            // Explicitly set all the nullable references so that IsSet is true
+            unknownReflector._deferringLoader.Value = null;
+            unknownReflector._getter.Value = null;
+            unknownReflector._setter.Value = null;
+            unknownReflector._typeConverter.Value = null;
+            unknownReflector._valueSerializer.Value = null;
+
+            unknownReflector.DependsOn = XamlType.EmptyList<XamlMember>.Value;
+            unknownReflector.Invoker = XamlMemberInvoker.UnknownInvoker;
+            unknownReflector.Type = XamlLanguage.Object;
+
+            return unknownReflector;
         }
 
         // Lazy init and thread safety note: all implicit properties (i.e properties without backing