Skip to content

Commit

Permalink
Merge branch 'adamhathcock:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
cyr authored Sep 12, 2021
2 parents 1b661c9 + b425659 commit 61802ea
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/SharpCompress/Common/Zip/SeekableZipHeaderFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ private static void SeekBackToHeader(Stream stream, BinaryReader reader)
// Search in reverse
Array.Reverse(seek);

var max_search_area = len - MINIMUM_EOCD_LENGTH;
// don't exclude the minimum eocd region, otherwise you fail to locate the header in empty zip files
var max_search_area = len; // - MINIMUM_EOCD_LENGTH;

for( int pos_from_end = 0; pos_from_end < max_search_area; ++pos_from_end)
{
Expand Down
22 changes: 22 additions & 0 deletions tests/SharpCompress.Test/Zip/ZipArchiveTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,28 @@ public void Zip_Create_New()
Directory.Delete(SCRATCH_FILES_PATH, true);
}

/// <summary>
/// Creates an empty zip file and attempts to read it right afterwards.
/// Ensures that parsing file headers works even in that case
/// </summary>
[Fact]
public void Zip_Create_Empty_And_Read()
{
var archive = ZipArchive.Create();

var archiveStream = new MemoryStream();

archive.SaveTo(archiveStream, CompressionType.LZMA);

archiveStream.Position = 0;

var readArchive = ArchiveFactory.Open(archiveStream);

var count = readArchive.Entries.Count();

Assert.Equal(0, count);
}

[Fact]
public void Zip_Create_New_Add_Remove()
{
Expand Down

0 comments on commit 61802ea

Please sign in to comment.