zervo/seb-win-refactoring
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SEBWIN-226: Leveraged new possibility of .NET 4.7 to keep inner stream of GZipStream open.

Browse source
This commit is contained in:
dbuechel 2019-03-28 08:44:34 +01:00
parent c02caa6732
commit 90fefae248
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
SafeExamBrowser.Configuration.UnitTests/DataCompression/GZipCompressorTests.cs
View file

@ -83,6 +83,16 @@ namespace SafeExamBrowser.Configuration.UnitTests.DataCompression
var preview = sut.Peek(compressed, 5); var preview = sut.Peek(compressed, 5);
try
{
var position = compressed.Position;
var length = compressed.Length;
}
catch (ObjectDisposedException)
{
Assert.Fail("Source stream was disposed after previewing data!");
}
Assert.AreEqual(5, preview.Length); Assert.AreEqual(5, preview.Length);
Assert.IsTrue(Encoding.UTF8.GetBytes("A com").SequenceEqual(preview)); Assert.IsTrue(Encoding.UTF8.GetBytes("A com").SequenceEqual(preview));
} }

3
SafeExamBrowser.Configuration/DataCompression/GZipCompressor.cs
View file

@ -103,10 +103,9 @@ namespace SafeExamBrowser.Configuration.DataCompression
public byte[] Peek(Stream data, int count) public byte[] Peek(Stream data, int count)
{ {
var stream = new GZipStream(data, CompressionMode.Decompress);
data.Seek(0, SeekOrigin.Begin); data.Seek(0, SeekOrigin.Begin);
using (var stream = new GZipStream(data, CompressionMode.Decompress, true))
using (var decompressed = new MemoryStream()) using (var decompressed = new MemoryStream())
{ {
var buffer = new byte[count]; var buffer = new byte[count];