Use safe version of Helper.ToBytes when calculating data hashes in Species.cs (#271)

alisterburt · web-flow · commit 6c2ae96a68ee · 2024-10-09T10:33:25.000-07:00
diff --git a/WarpLib/Sociology/Species.cs b/WarpLib/Sociology/Species.cs
@@ -2341,9 +2341,9 @@ public void ComputeVersionHash()
             Builder.Append(MathHelper.GetSHA1(Helper.ToBytes(Helper.ToInterleaved(Helper.Combine(DescendantParticles.Select(p => p.Coordinates))))));
             Builder.Append(MathHelper.GetSHA1(Helper.ToBytes(Helper.ToInterleaved(Helper.Combine(DescendantParticles.Select(p => p.Angles))))));
 
-            Builder.Append(MathHelper.GetSHA1(Helper.ToBytes(HalfMap1.GetHostContinuousCopy())));
-            Builder.Append(MathHelper.GetSHA1(Helper.ToBytes(HalfMap2.GetHostContinuousCopy())));
-            Builder.Append(MathHelper.GetSHA1(Helper.ToBytes(Mask.GetHostContinuousCopy())));
+            Builder.Append(MathHelper.GetSHA1(Helper.ToBytesSafe(HalfMap1.GetHostContinuousCopy())));
+            Builder.Append(MathHelper.GetSHA1(Helper.ToBytesSafe(HalfMap2.GetHostContinuousCopy())));
+            Builder.Append(MathHelper.GetSHA1(Helper.ToBytesSafe(Mask.GetHostContinuousCopy())));
 
             Version = MathHelper.GetSHA1(Helper.ToBytes(Builder.ToString().ToCharArray())).Substring(0, 8);
         }
diff --git a/WarpLib/Tools/Helper.cs b/WarpLib/Tools/Helper.cs
@@ -1106,6 +1106,15 @@ public static byte[] ToBytes(float[] data)
 
             return Bytes;
         }
+        
+        public static byte[] ToBytesSafe(float[] data)
+        {
+            // truncates data in byte array if necessary
+            byte[] Bytes = new byte[Math.Min(1 << 19, data.Length * sizeof(float))];
+            Buffer.BlockCopy(data, 0, Bytes, 0, Bytes.Length);
+
+            return Bytes;
+        }
 
         public static byte[] ToBytes(int[] data)
         {

Original file line number	Diff line number	Diff line change
`@@ -1106,6 +1106,15 @@ public static byte[] ToBytes(float[] data)`
`1106`	`1106`
`1107`	`1107`	`return Bytes;`
`1108`	`1108`	`}`
	`1109`	`+`
	`1110`	`+ public static byte[] ToBytesSafe(float[] data)`
	`1111`	`+ {`
	`1112`	`+ // truncates data in byte array if necessary`
	`1113`	`+ byte[] Bytes = new byte[Math.Min(1 << 19, data.Length * sizeof(float))];`
	`1114`	`+ Buffer.BlockCopy(data, 0, Bytes, 0, Bytes.Length);`
	`1115`	`+`
	`1116`	`+ return Bytes;`
	`1117`	`+ }`
`1109`	`1118`
`1110`	`1119`	`public static byte[] ToBytes(int[] data)`
`1111`	`1120`	`{`