Merge pull request #835 from Blokyk/fix-736

Prevent infinite loop when reading corrupted archive
adamhathcock · Apr 24, 2024 · 7488802 · 7488802
2 parents b203d16 + 9483856
commit 7488802
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/src/SharpCompress/Archives/Tar/TarArchive.cs b/src/SharpCompress/Archives/Tar/TarArchive.cs
@@ -190,6 +190,10 @@ var header in TarHeaderFactory.ReadHeader(
                     );
                 }
             }
+            else
+            {
+                throw new IncompleteArchiveException("Failed to read TAR header");
+            }
         }
     }
 

diff --git a/tests/SharpCompress.Test/Tar/TarReaderTests.cs b/tests/SharpCompress.Test/Tar/TarReaderTests.cs
@@ -183,6 +183,21 @@ public void Tar_Broken_Stream()
         Assert.Throws<IncompleteArchiveException>(() => reader.MoveToNextEntry());
     }
 
+    [Fact]
+    public void Tar_Corrupted()
+    {
+        var archiveFullPath = Path.Combine(TEST_ARCHIVES_PATH, "TarCorrupted.tar");
+        using Stream stream = File.OpenRead(archiveFullPath);
+        using var reader = ReaderFactory.Open(stream);
+        var memoryStream = new MemoryStream();
+
+        Assert.True(reader.MoveToNextEntry());
+        Assert.True(reader.MoveToNextEntry());
+        reader.WriteEntryTo(memoryStream);
+        stream.Close();
+        Assert.Throws<IncompleteArchiveException>(() => reader.MoveToNextEntry());
+    }
+
 #if !NETFRAMEWORK
     [Fact]
     public void Tar_GZip_With_Symlink_Entries()

diff --git a/tests/TestArchives/Archives/TarCorrupted.tar b/tests/TestArchives/Archives/TarCorrupted.tar