fix the bugs I've introduced when porting the code to older monikers

dotnet · May 20, 2024 · 3a90452 · 3a90452
1 parent cde8100
commit 3a90452
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...ries/System.Resources.Extensions/src/BinaryFormat/Deserializer/ArrayRecordDeserializer.cs b/...ries/System.Resources.Extensions/src/BinaryFormat/Deserializer/ArrayRecordDeserializer.cs
@@ -53,6 +53,7 @@ internal ArrayRecordDeserializer(ArrayRecord arrayRecord, IDeserializer deserial
         Object = _arrayOfT = Array.CreateInstance(_elementType, lengths);
         _lengths = lengths;
         _indices = new int[lengths.Length];
+        _canIterate = _arrayOfT.Length > 0;
     }
 
     internal override Id Continue()

diff --git a/...ries/System.Resources.Extensions/src/BinaryFormat/Deserializer/ClassRecordDeserializer.cs b/...ries/System.Resources.Extensions/src/BinaryFormat/Deserializer/ClassRecordDeserializer.cs
@@ -45,8 +45,7 @@ internal static ObjectRecordDeserializer Create(ClassRecord classRecord, IDeseri
 #if NETCOREAPP
             RuntimeHelpers.GetUninitializedObject(type);
 #else
-            // adsitnik: is this the best option we have?
-            Activator.CreateInstance(type);
+            Runtime.Serialization.FormatterServices.GetUninitializedObject(type);
 #endif
 
         // Invoke any OnDeserializing methods.