Fix #13 - TAR does not have enough EOF blocks

icsharpcode · Aug 18, 2017 · 7ff36ba · 7ff36ba
1 parent d2526a8
commit 7ff36ba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/ICSharpCode.SharpZipLib/Tar/TarOutputStream.cs b/src/ICSharpCode.SharpZipLib/Tar/TarOutputStream.cs
@@ -390,12 +390,13 @@ public override void Write(byte[] buffer, int offset, int count)
 
 		/// <summary>
 		/// Write an EOF (end of archive) block to the tar archive.
-		/// An EOF block consists of all zeros.
+		/// The	end of the archive is indicated	by two blocks consisting entirely of zero bytes.
 		/// </summary>
 		void WriteEofBlock()
 		{
 			Array.Clear(blockBuffer, 0, blockBuffer.Length);
 			buffer.WriteBlock(blockBuffer);
+			buffer.WriteBlock(blockBuffer);
 		}
 
 		#region Instance Fields

diff --git a/test/ICSharpCode.SharpZipLib.Tests/Tar/TarTests.cs b/test/ICSharpCode.SharpZipLib.Tests/Tar/TarTests.cs
@@ -82,7 +82,7 @@ public void BlockFactorHandling()
 				Assert.IsNotNull(tarData, "Data written is null");
 
 				// Blocks = Header + Data Blocks + Zero block + Record trailer
-				int usedBlocks = 1 + (factor * FillFactor) + 1;
+				int usedBlocks = 1 + (factor * FillFactor) + 2;
 				int totalBlocks = usedBlocks + (factor - 1);
 				totalBlocks /= factor;
 				totalBlocks *= factor;
@@ -146,7 +146,7 @@ public void TrailerContainsNulls()
 				Assert.IsNotNull(tarData, "Data written is null");
 
 				// Blocks = Header + Data Blocks + Zero block + Record trailer
-				int usedBlocks = 1 + iteration + 1;
+				int usedBlocks = 1 + iteration + 2;
 				int totalBlocks = usedBlocks + (TestBlockFactor - 1);
 				totalBlocks /= TestBlockFactor;
 				totalBlocks *= TestBlockFactor;