starred/sharpcompress
1
0
Fork 0
mirror of https://github.com/adamhathcock/sharpcompress.git synced 2026-09-24 16:05:27 +00:00
Code Issues 975 Packages Projects Releases 25 Wiki Activity

Merge pull request #891 from Morilli/fix-zip-datadescriptor-header

Browse Source 
Fix zip entry handling for entries with data descriptors
This commit is contained in:
Adam Hathcock
2025-01-28 08:12:40 +00:00
committed by GitHub
parent 79ed9650b3 37a2fa1cdc
commit 8d63ab646e
3 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/SharpCompress/Common/Zip/SeekableZipFilePart.cs
View File

@@ -1,6 +1,5 @@
using System.IO;
using SharpCompress.Common.Zip.Headers;
using SharpCompress.IO;
namespace SharpCompress.Common.Zip;
@@ -8,18 +7,13 @@ internal class SeekableZipFilePart : ZipFilePart
{
private bool _isLocalHeaderLoaded;
private readonly SeekableZipHeaderFactory _headerFactory;
private readonly DirectoryEntryHeader _directoryEntryHeader;
internal SeekableZipFilePart(
SeekableZipHeaderFactory headerFactory,
DirectoryEntryHeader header,
Stream stream
)
: base(header, stream)
{
_headerFactory = headerFactory;
_directoryEntryHeader = header;
}
: base(header, stream) => _headerFactory = headerFactory;
internal override Stream GetCompressedStream()
{
@@ -44,16 +38,6 @@ internal class SeekableZipFilePart : ZipFilePart
{
BaseStream.Position = Header.DataStartPosition.NotNull();
if (
(Header.CompressedSize == 0)
&& FlagUtility.HasFlag(Header.Flags, HeaderFlags.UsePostDataDescriptor)
&& _directoryEntryHeader.HasData
&& (_directoryEntryHeader.CompressedSize != 0)
)
{
return new ReadOnlySubStream(BaseStream, _directoryEntryHeader.CompressedSize);
}
return BaseStream;
}
}

6
src/SharpCompress/Common/Zip/SeekableZipHeaderFactory.cs
View File

@@ -149,6 +149,12 @@ internal sealed class SeekableZipHeaderFactory : ZipHeaderFactory
{
throw new InvalidOperationException();
}
if (FlagUtility.HasFlag(localEntryHeader.Flags, HeaderFlags.UsePostDataDescriptor))
{
localEntryHeader.Crc = directoryEntryHeader.Crc;
localEntryHeader.CompressedSize = directoryEntryHeader.CompressedSize;
localEntryHeader.UncompressedSize = directoryEntryHeader.UncompressedSize;
}
return localEntryHeader;
}
}

12
tests/SharpCompress.Test/Zip/ZipArchiveTests.cs
View File

@@ -808,4 +808,16 @@ public class ZipArchiveTests : ArchiveTests
Assert.Equal("きょきゅんきゃんきゅ_wav.frq", reader.Entry.Key);
}
}
[Fact]
public void TestDataDescriptorRead()
{
using var archive = ArchiveFactory.Open(
Path.Combine(TEST_ARCHIVES_PATH, "Zip.none.datadescriptors.zip")
);
var firstEntry = archive.Entries.First();
Assert.Equal(199, firstEntry.Size);
using var _ = firstEntry.OpenEntryStream();
Assert.Equal(199, firstEntry.Size);
}
}