From 04cc54c39217d1766696d0a2d44ca615c9534f75 Mon Sep 17 00:00:00 2001 From: penev92 Date: Wed, 17 Jun 2015 20:19:30 +0300 Subject: [PATCH] Get rid of an undisposed MemoryStream in PackageEntry And a BinaryReader --- OpenRA.Game/FileSystem/PackageEntry.cs | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/OpenRA.Game/FileSystem/PackageEntry.cs b/OpenRA.Game/FileSystem/PackageEntry.cs index 84652190de..5222d92e78 100644 --- a/OpenRA.Game/FileSystem/PackageEntry.cs +++ b/OpenRA.Game/FileSystem/PackageEntry.cs @@ -65,14 +65,19 @@ namespace OpenRA.FileSystem if (name.Length % 4 != 0) name = name.PadRight(name.Length + (4 - name.Length % 4), '\0'); - var ms = new MemoryStream(Encoding.ASCII.GetBytes(name)); - var reader = new BinaryReader(ms); - - var len = name.Length >> 2; uint result = 0; - - while (len-- != 0) - result = ((result << 1) | (result >> 31)) + reader.ReadUInt32(); + var bytes = Encoding.ASCII.GetBytes(name); + unsafe + { + // Cast the data to an int array + fixed (byte* bd = &bytes[0]) + { + var data = (uint*)bd; + var len = name.Length >> 2; + for (var i = 0; i < len; i++) + result = ((result << 1) | (result >> 31)) + data[i++]; + } + } return result; }