SabreTools/SabreTools.Serialization
1
0
Fork 0
mirror of https://github.com/SabreTools/SabreTools.Serialization.git synced 2026-09-22 23:05:12 +00:00
Code Issues 56 Packages Projects Releases 20 Wiki Activity

More rudimentary ZIP64 fixes

Browse Source
This commit is contained in:
Matt Nadareski
2024-04-28 00:24:35 -04:00
parent 52dbcffd8e
commit 4b7487e92e
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
SabreTools.Serialization/Deserializers/PKZIP.cs
View File

@@ -1,3 +1,4 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Text;
@@ -50,8 +51,12 @@ namespace SabreTools.Serialization.Deserializers
// Set a flag for ZIP64 not found by default
bool zip64 = false;
// Process ZIP64 if we have the minimal set of indicators
if (eocdr.CentralDirectorySize == 0xFFFFFFFF
// Process ZIP64 if any fields are set to max value
if (eocdr.DiskNumber == 0xFFFF
|| eocdr.StartDiskNumber == 0xFFFF
|| eocdr.TotalEntriesOnDisk == 0xFFFF
|| eocdr.TotalEntries == 0xFFFF
|| eocdr.CentralDirectorySize == 0xFFFFFFFF
|| eocdr.CentralDirectoryOffset == 0xFFFFFFFF)
{
// Set the ZIP64 flag
@@ -138,6 +143,8 @@ namespace SabreTools.Serialization.Deserializers
#endregion
// TODO: Handle digital signature -- immediately following central directory records
#region Archive Extra Data Record
// Find the archive extra data record
@@ -174,6 +181,14 @@ namespace SabreTools.Serialization.Deserializers
// Get the local file header offset
long headerOffset = header.RelativeOffsetOfLocalHeader;
if (headerOffset == 0xFFFFFFFF && header.ExtraField != null)
{
// TODO: Parse into a proper structure instead of this
byte[] extraData = header.ExtraField;
if (BitConverter.ToUInt16(extraData, 0) == 0x0001)
headerOffset = BitConverter.ToInt64(extraData, 4);
}
if (headerOffset < 0 || headerOffset >= data.Length)
return null;