0.5.2: Fixed premature end of inner stream detection in Decompression…

…Stream
oleg-st · Oct 14, 2021 · 50e8c80 · 50e8c80
1 parent 1b93e09
commit 50e8c80
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 4 deletions.
diff --git a/src/ZstdSharp.Test/ZstdNetSteamingTests.cs b/src/ZstdSharp.Test/ZstdNetSteamingTests.cs
@@ -146,6 +146,27 @@ public void StreamingDecompressionSimpleRead(int readCount)
             Assert.True(data.SequenceEqual(buffer));
         }
 
+        [Fact]
+        public void StreamingDecompressionTruncatedInput()
+        {
+            var dataStream = DataGenerator.GetLargeStream(DataFill.Sequential);
+
+            var resultStream = new MemoryStream();
+            using (var compressionStream = new CompressionStream(resultStream))
+                dataStream.CopyTo(compressionStream);
+
+            // truncate resultStream
+            var truncatedStream =
+                new MemoryStream(resultStream.ToArray(), 0, Math.Min(32, (int) resultStream.Length / 3));
+
+            var exception = Record.Exception(() =>
+            {
+                using var decompressionStream = new DecompressionStream(truncatedStream);
+                decompressionStream.CopyTo(resultStream);
+            });
+            Assert.True(exception is EndOfStreamException);
+        }
+
         [Fact]
         public void StreamingCompressionFlushDataFromInternalBuffers()
         {

diff --git a/src/ZstdSharp/DecompressionStream.cs b/src/ZstdSharp/DecompressionStream.cs
@@ -60,9 +60,6 @@ protected override void Dispose(bool disposing)
             if (decompressor == null)
                 return;
 
-            if (lastDecompressResult != 0)
-                throw new EndOfStreamException("Premature end of stream");
-
             decompressor.Dispose();
             decompressor = null;
             ArrayPool<byte>.Shared.Return(inputBuffer);
@@ -86,7 +83,12 @@ public int Read(Span<byte> buffer)
                 {
                     int bytesRead;
                     if ((bytesRead = innerStream.Read(inputBuffer, 0, inputBufferSize)) == 0)
+                    {
+                        if (lastDecompressResult != 0)
+                            throw new EndOfStreamException("Premature end of stream");
+
                         break;
+                    }
 
                     input.size = (nuint) bytesRead;
                     input.pos = 0;
@@ -119,7 +121,12 @@ public async ValueTask<int> ReadAsync(Memory<byte> buffer,
                     int bytesRead;
                     if ((bytesRead = await innerStream.ReadAsync(inputBuffer, 0, inputBufferSize, cancellationToken)
                         .ConfigureAwait(false)) == 0)
+                    {
+                        if (lastDecompressResult != 0)
+                            throw new EndOfStreamException("Premature end of stream");
+
                         break;
+                    }
 
                     input.size = (nuint) bytesRead;
                     input.pos = 0;

diff --git a/src/ZstdSharp/ZstdSharp.csproj b/src/ZstdSharp/ZstdSharp.csproj
@@ -14,7 +14,7 @@
     <PackageProjectUrl>https://github.com/oleg-st/ZstdSharp</PackageProjectUrl>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <PackageTags>zstd zstandard port compression</PackageTags>
-    <Version>0.5.1</Version>
+    <Version>0.5.2</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">