Merge pull request #8501 from penev92/bleed_streams

Dispose of a MemoryStream in PackageEntry
This commit is contained in:
Oliver Brakmann
2015-06-22 22:11:28 +02:00

View File

@@ -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;
}