From 0fb63eea991b7088c60abfdc41733dff7662e3c9 Mon Sep 17 00:00:00 2001 From: Lars Vahlenberg Date: Tue, 28 Mar 2023 23:07:21 +0200 Subject: [PATCH 1/3] Check for broken file --- src/SharpCompress/Common/Tar/TarEntry.cs | 4 ++++ .../SharpCompress.Test/Tar/TarReaderTests.cs | 20 +++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/src/SharpCompress/Common/Tar/TarEntry.cs b/src/SharpCompress/Common/Tar/TarEntry.cs index 7b5e4a05..59743070 100644 --- a/src/SharpCompress/Common/Tar/TarEntry.cs +++ b/src/SharpCompress/Common/Tar/TarEntry.cs @@ -72,6 +72,10 @@ public class TarEntry : Entry yield return new TarEntry(new TarFilePart(h, null), compressionType); } } + else + { + throw new IncompleteArchiveException("Unexpected EOF reading tar file"); + } } } } diff --git a/tests/SharpCompress.Test/Tar/TarReaderTests.cs b/tests/SharpCompress.Test/Tar/TarReaderTests.cs index a92a3c0a..f7bbdbbb 100644 --- a/tests/SharpCompress.Test/Tar/TarReaderTests.cs +++ b/tests/SharpCompress.Test/Tar/TarReaderTests.cs @@ -183,6 +183,26 @@ public class TarReaderTests : ReaderTests } } + [Fact] + public void Tar_Broken_Stream() + { + string archiveFullPath = Path.Combine(TEST_ARCHIVES_PATH, "Tar.tar"); + using (Stream stream = File.OpenRead(archiveFullPath)) + using (IReader reader = ReaderFactory.Open(stream)) + { + var memoryStream = new MemoryStream(); + + Action action = () => reader.MoveToNextEntry(); + var exception = Record.Exception(action); + Assert.Null(exception); + reader.MoveToNextEntry(); + reader.WriteEntryTo(memoryStream); + stream.Close(); + Assert.Throws(action); + } + } + + #if !NETFRAMEWORK [Fact] public void Tar_GZip_With_Symlink_Entries() From fe63466d67c5704a9a04e590426df7400a99181b Mon Sep 17 00:00:00 2001 From: Lars Vahlenberg Date: Wed, 29 Mar 2023 18:18:17 +0200 Subject: [PATCH 2/3] CSharpier --- tests/SharpCompress.Test/Tar/TarArchiveTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/SharpCompress.Test/Tar/TarArchiveTests.cs b/tests/SharpCompress.Test/Tar/TarArchiveTests.cs index fd05d15e..dddb32a6 100644 --- a/tests/SharpCompress.Test/Tar/TarArchiveTests.cs +++ b/tests/SharpCompress.Test/Tar/TarArchiveTests.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using System.Linq; using SharpCompress.Archives; From b7d2715ffd83b59ba271b8b0282701c164ca03ce Mon Sep 17 00:00:00 2001 From: Lars Vahlenberg Date: Wed, 29 Mar 2023 19:39:03 +0200 Subject: [PATCH 3/3] Remove whitespace --- tests/SharpCompress.Test/Tar/TarReaderTests.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/SharpCompress.Test/Tar/TarReaderTests.cs b/tests/SharpCompress.Test/Tar/TarReaderTests.cs index f7bbdbbb..76629363 100644 --- a/tests/SharpCompress.Test/Tar/TarReaderTests.cs +++ b/tests/SharpCompress.Test/Tar/TarReaderTests.cs @@ -202,7 +202,6 @@ public class TarReaderTests : ReaderTests } } - #if !NETFRAMEWORK [Fact] public void Tar_GZip_With_Symlink_Entries()