Dispose underlying stream in TarReader.DisposeAsync() as well (dotnet…

…#79920) * Dispose underlying stream in TarReader.DisposeAsync() as well Same as dotnet#79899 * Consolidate duplicated WrappedStream test helpers to Common sources * Dispose stream passed to WrappedStream
jozkee · Jan 12, 2023 · 1fbde51 · 1fbde51
1 parent 08e8e19
commit 1fbde51
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 133 deletions.
diff --git a/...System.Formats.Tar/tests/WrappedStream.cs → ...s/Common/tests/System/IO/WrappedStream.cs b/...System.Formats.Tar/tests/WrappedStream.cs → ...s/Common/tests/System/IO/WrappedStream.cs
@@ -1,9 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.IO;
-
-namespace System.Formats.Tar
+namespace System.IO
 {
  public class WrappedStream : Stream
  {

diff --git a/src/libraries/System.Formats.Tar/src/System/Formats/Tar/TarReader.cs b/src/libraries/System.Formats.Tar/src/System/Formats/Tar/TarReader.cs
@@ -82,11 +82,16 @@ public async ValueTask DisposeAsync()
  {
  _isDisposed = true;
 
- if (!_leaveOpen && _dataStreamsToDispose?.Count > 0)
+ if (!_leaveOpen)
  {
- foreach (Stream s in _dataStreamsToDispose)
+ await _archiveStream.DisposeAsync().ConfigureAwait(false);
+
+ if (_dataStreamsToDispose?.Count > 0)
  {
- await s.DisposeAsync().ConfigureAwait(false);
+ foreach (Stream s in _dataStreamsToDispose)
+ {
+ await s.DisposeAsync().ConfigureAwait(false);
+ }
  }
  }
  }

diff --git a/src/libraries/System.Formats.Tar/tests/System.Formats.Tar.Tests.csproj b/src/libraries/System.Formats.Tar/tests/System.Formats.Tar.Tests.csproj
@@ -68,9 +68,9 @@
  <Compile Include="TarWriter\TarWriter.WriteEntry.Tests.cs" />
  <Compile Include="TarWriter\TarWriter.WriteEntry.Entry.Ustar.Tests.cs" />
  <Compile Include="TarWriter\TarWriter.WriteEntry.Entry.V7.Tests.cs" />
- <Compile Include="WrappedStream.cs" Link="WrappedStream.cs" />
  <Compile Include="$(CommonPath)DisableRuntimeMarshalling.cs" Link="Common\DisableRuntimeMarshalling.cs" />
  <Compile Include="$(CommonTestPath)System\IO\ReparsePointUtilities.cs" Link="Common\System\IO\ReparsePointUtilities.cs" />
+ <Compile Include="$(CommonTestPath)System\IO\WrappedStream.cs" Link="Common\System\IO\WrappedStream.cs" />
  <Compile Include="$(CommonTestPath)TestUtilities\System\DisableParallelization.cs" Link="Common\TestUtilities\System\DisableParallelization.cs" />
  </ItemGroup>
  <!-- Windows specific files -->

diff --git a/src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntry.LongFile.Tests.cs b/src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntry.LongFile.Tests.cs
@@ -30,7 +30,7 @@ public static IEnumerable<object[]> WriteEntry_LongFileSize_TheoryData()
  public void WriteEntry_LongFileSize(TarEntryFormat entryFormat, long size, bool unseekableStream)
  {
  // Write archive with a 8 Gb long entry.
- FileStream tarFile = File.Open(GetTestFilePath(), new FileStreamOptions { Access = FileAccess.ReadWrite, Mode = FileMode.Create, Options = FileOptions.DeleteOnClose });
+ using FileStream tarFile = File.Open(GetTestFilePath(), new FileStreamOptions { Access = FileAccess.ReadWrite, Mode = FileMode.Create, Options = FileOptions.DeleteOnClose });
  Stream s = unseekableStream ? new WrappedStream(tarFile, tarFile.CanRead, tarFile.CanWrite, canSeek: false) : tarFile;
 
  using (TarWriter writer = new(s, leaveOpen: true))

diff --git a/src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntryAsync.LongFile.Tests.cs b/src/libraries/System.Formats.Tar/tests/TarWriter/TarWriter.WriteEntryAsync.LongFile.Tests.cs
@@ -20,7 +20,7 @@ public static IEnumerable<object[]> WriteEntry_LongFileSize_TheoryDataAsync()
  public async Task WriteEntry_LongFileSizeAsync(TarEntryFormat entryFormat, long size, bool unseekableStream)
  {
  // Write archive with a 8 Gb long entry.
- FileStream tarFile = File.Open(GetTestFilePath(), new FileStreamOptions { Access = FileAccess.ReadWrite, Mode = FileMode.Create, Options = FileOptions.DeleteOnClose });
+ await using FileStream tarFile = File.Open(GetTestFilePath(), new FileStreamOptions { Access = FileAccess.ReadWrite, Mode = FileMode.Create, Options = FileOptions.DeleteOnClose });
  Stream s = unseekableStream ? new WrappedStream(tarFile, tarFile.CanRead, tarFile.CanWrite, canSeek: false) : tarFile;
 
  await using (TarWriter writer = new(s, leaveOpen: true))

diff --git a/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj b/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj
@@ -17,7 +17,6 @@
  <Compile Include="CompressionStreamUnitTests.Deflate.cs" />
  <Compile Include="CompressionStreamUnitTests.Gzip.cs" />
  <Compile Include="Utilities\StripHeaderAndFooter.cs" />
- <Compile Include="Utilities\WrappedStream.cs" />
  <Compile Include="XunitAssemblyAttributes.cs" />
  <Compile Include="ZipArchive\zip_CreateTests.cs" />
  <Compile Include="ZipArchive\zip_CreateTests.Comments.cs" />
@@ -36,6 +35,7 @@
  <Compile Include="$(CommonTestPath)System\IO\Compression\LocalMemoryStream.cs" Link="Common\System\IO\Compression\LocalMemoryStream.cs" />
  <Compile Include="$(CommonTestPath)System\IO\Compression\StreamHelpers.cs" Link="Common\System\IO\Compression\StreamHelpers.cs" />
  <Compile Include="$(CommonTestPath)System\IO\TempFile.cs" Link="Common\System\IO\TempFile.cs" />
+ <Compile Include="$(CommonTestPath)System\IO\WrappedStream.cs" Link="Common\System\IO\WrappedStream.cs" />
  <Compile Include="$(CommonTestPath)System\IO\Compression\ZipTestHelper.cs" Link="Common\System\IO\Compression\ZipTestHelper.cs" />
  <Compile Include="$(CommonTestPath)TestUtilities\System\DisableParallelization.cs" Link="Common\TestUtilities\System\DisableParallelization.cs" />
  <Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs" Link="Common\System\Threading\Tasks\TaskToApm.cs" />

diff --git a/src/libraries/System.IO.Compression/tests/Utilities/WrappedStream.cs b/src/libraries/System.IO.Compression/tests/Utilities/WrappedStream.cs