Update WzBinaryProperty - fix depreciated FormatterServices.GetUninit…

…ializedObject(typeof(T)) func
lastbattle · Oct 16, 2024 · a24bb09 · a24bb09
1 parent 2de16b9
commit a24bb09
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/MapleLib/WzLib/WzProperties/WzBinaryProperty.cs b/MapleLib/WzLib/WzProperties/WzBinaryProperty.cs
@@ -326,14 +326,21 @@ private static byte[] StructToBytes<T>(T obj)
             }
         }
 
-        private static T BytesToStructConstructorless<T>(byte[] data)
+        private static T BytesToStructConstructorless<T>(byte[] data) where T : class
         {
+            if (data == null)
+                throw new ArgumentNullException(nameof(data));
+
+            int objectSize = Marshal.SizeOf(typeof(T));
+            if (data.Length < objectSize)
+                throw new ArgumentException($"The byte array must be at least {objectSize} bytes long to contain the entire object.", nameof(data));
+
             GCHandle handle = GCHandle.Alloc(data, GCHandleType.Pinned);
             try
             {
-                T obj = (T)FormatterServices.GetUninitializedObject(typeof(T));
-                Marshal.PtrToStructure<T>(handle.AddrOfPinnedObject(), obj);
-                return obj;
+                IntPtr ptr = handle.AddrOfPinnedObject();
+                object obj = Marshal.PtrToStructure(ptr, typeof(T));
+                return (T)obj;
             }
             finally
             {