From 8fcb0cb7a2f7f5f197c588c5b1773eddd4e944f6 Mon Sep 17 00:00:00 2001
From: Strachu <P.Strachu@gmail.com>
Date: Tue, 16 Dec 2014 11:11:02 +0100
Subject: [PATCH] Fixed bug causing entries of non-ustar archive being after
 one with very long name to be discarded

---
 SharpCompress.Test/Tar/TarArchiveTests.cs    |  10 +++++++---
 SharpCompress/Archive/Tar/TarArchive.cs      |  20 ++++++++++++++-----
 TestArchives/Archives/very long filename.tar | Bin 43520 -> 46592 bytes
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/SharpCompress.Test/Tar/TarArchiveTests.cs b/SharpCompress.Test/Tar/TarArchiveTests.cs
index 3cbd6998..71a11e97 100644
--- a/SharpCompress.Test/Tar/TarArchiveTests.cs
+++ b/SharpCompress.Test/Tar/TarArchiveTests.cs
@@ -30,13 +30,17 @@ namespace SharpCompress.Test
 
 
         [TestMethod]
-        public void TarArchivePathReadLongName()
+        public void Tar_NonUstarArchiveWithLongNameDoesNotSkipEntriesAfterTheLongOne()
         {
             string unmodified = Path.Combine(TEST_ARCHIVES_PATH, "very long filename.tar");
             using (var archive = TarArchive.Open(unmodified))
             {
-                Assert.AreEqual(2, archive.Entries.Count);
-                Assert.AreEqual(archive.Entries.Last().Key, @"very long filename/very long filename very long filename very long filename very long filename very long filename very long filename very long filename very long filename very long filename very long filename.jpg");
+                Assert.AreEqual(5, archive.Entries.Count);
+                Assert.IsTrue(archive.Entries.Any(entry => entry.Key == "very long filename/"));
+                Assert.IsTrue(archive.Entries.Any(entry => entry.Key == "very long filename/very long filename very long filename very long filename very long filename very long filename very long filename very long filename very long filename very long filename very long filename.jpg"));
+                Assert.IsTrue(archive.Entries.Any(entry => entry.Key == "z_file 1.txt"));
+                Assert.IsTrue(archive.Entries.Any(entry => entry.Key == "z_file 2.txt"));
+                Assert.IsTrue(archive.Entries.Any(entry => entry.Key == "z_file 3.txt"));
             }
         }
 
diff --git a/SharpCompress/Archive/Tar/TarArchive.cs b/SharpCompress/Archive/Tar/TarArchive.cs
index e801854b..4258a37e 100644
--- a/SharpCompress/Archive/Tar/TarArchive.cs
+++ b/SharpCompress/Archive/Tar/TarArchive.cs
@@ -169,11 +169,21 @@ namespace SharpCompress.Archive.Tar
                         {
                             var entry = new TarArchiveEntry(this, new TarFilePart(previousHeader, stream),
                                                             CompressionType.None);
-                            var memoryStream = new MemoryStream();
-                            entry.WriteTo(memoryStream);
-                            memoryStream.Position = 0;
-                            var bytes = memoryStream.ToArray();
-                            header.Name = ArchiveEncoding.Default.GetString(bytes, 0, bytes.Length).TrimNulls();
+
+                            var oldStreamPos = stream.Position;
+
+                            using(var entryStream = entry.OpenEntryStream())
+                            using(var memoryStream = new MemoryStream())
+                            {
+                                entryStream.TransferTo(memoryStream);
+                                memoryStream.Position = 0;
+                                var bytes = memoryStream.ToArray();
+
+                                header.Name = ArchiveEncoding.Default.GetString(bytes, 0, bytes.Length).TrimNulls();
+                            }
+
+                            stream.Position = oldStreamPos;
+
                             previousHeader = null;
                         }
                         yield return new TarArchiveEntry(this, new TarFilePart(header, stream), CompressionType.None);
diff --git a/TestArchives/Archives/very long filename.tar b/TestArchives/Archives/very long filename.tar
index fb4f0daa0e0c22fc0d434f82e0688dd07f45cde2..d7abd2f109c5c17e035e558a5ca48f60865d3271 100644
GIT binary patch
delta 233
zcmZp;!qo7FX+oE<iHWhfxsj=%p@M>fxv8n40)y%1gG-Yc7cnj2sftg_%t=)+)GMhd
znYb`watf1zq=JIEf}s&am!YY#f`WpXk*SFSg8^6<yK{bCNoron=7URrGQ#v55!7#r
USHCeq{bpG7+p}!GuyhwA0Cx;X<p2Nx

delta 40
wcmZp8!_;tvX+oE<fq}89fuWg!fr5g9xv7zv0)y#h!4=7ji<p)yR@lG-0Qrpz$p8QV