From a57204449770a580db485af0834e425d465bc899 Mon Sep 17 00:00:00 2001 From: Oliver Brakmann Date: Tue, 23 Jun 2015 17:37:35 +0200 Subject: [PATCH] Revert "Dispose of a MemoryStream in PackageEntry" --- OpenRA.Game/FileSystem/PackageEntry.cs | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/OpenRA.Game/FileSystem/PackageEntry.cs b/OpenRA.Game/FileSystem/PackageEntry.cs index 5222d92e78..84652190de 100644 --- a/OpenRA.Game/FileSystem/PackageEntry.cs +++ b/OpenRA.Game/FileSystem/PackageEntry.cs @@ -65,19 +65,14 @@ 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; - 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++]; - } - } + + while (len-- != 0) + result = ((result << 1) | (result >> 31)) + reader.ReadUInt32(); return result; }