Merge pull request #251 from mattosaurus/bug/250-output-stream-disposal

Don't dispose compressed ouitput stream
mattosaurus · Nov 13, 2023 · 8535de9 · 8535de9
2 parents 9225aa8 + 37828c9
commit 8535de9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/.github/workflows/analyze.yml b/.github/workflows/analyze.yml
@@ -5,7 +5,7 @@ jobs:
   analyze:
     runs-on: windows-latest
     steps:
-      - name: Set up JDK 11
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
           java-version: 11

diff --git a/PgpCore/PGP.cs b/PgpCore/PGP.cs
@@ -5010,13 +5010,12 @@ private async Task OutputSignedAsync(FileInfo inputFile, Stream outputStream)
 		private async Task OutputSignedAsync(Stream inputStream, Stream outputStream,
 			string name)
 		{
-			using (Stream compressedOut = ChainCompressedOut(outputStream))
+			Stream compressedOut = ChainCompressedOut(outputStream);
+
+			PgpSignatureGenerator signatureGenerator = InitSignatureGenerator(compressedOut);
+			using (Stream literalOut = ChainLiteralStreamOut(compressedOut, inputStream, name))
 			{
-				PgpSignatureGenerator signatureGenerator = InitSignatureGenerator(compressedOut);
-				using (Stream literalOut = ChainLiteralStreamOut(compressedOut, inputStream, name))
-				{
-					await WriteOutputAndSignAsync(compressedOut, literalOut, inputStream, signatureGenerator);
-				}
+				await WriteOutputAndSignAsync(compressedOut, literalOut, inputStream, signatureGenerator);
 			}
 		}
 

diff --git a/PgpCore/PgpCore.csproj b/PgpCore/PgpCore.csproj
@@ -10,10 +10,10 @@
     <PackageProjectUrl>https://github.com/mattosaurus/PgpCore</PackageProjectUrl>
     <RepositoryUrl>https://github.com/mattosaurus/PgpCore</RepositoryUrl>
     <PackageTags>PGP .NET Core</PackageTags>
-    <Version>5.13.0.0</Version>
+    <Version>5.13.1.0</Version>
     <AssemblyVersion>5.0.0.0</AssemblyVersion>
-    <FileVersion>5.13.0</FileVersion>
-    <PackageReleaseNotes>v5.13.0 - Add prefered encryption key</PackageReleaseNotes>
+    <FileVersion>5.13.1</FileVersion>
+    <PackageReleaseNotes>v5.13.1 - Don't dispose compressed output stream</PackageReleaseNotes>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <IncludeSymbols>true</IncludeSymbols>