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

Fix inconsistencies in IS-CAB

Browse Source
This commit is contained in:
Matt Nadareski
2025-11-14 23:21:04 -05:00
parent 8a1e90f537
commit 425d13a2ac
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
SabreTools.Serialization/Wrappers/InstallShieldCabinet.Extraction.cs
View File

@@ -290,10 +290,13 @@ namespace SabreTools.Serialization.Wrappers
ulong readBytesLeft = GetReadableBytes(fileDescriptor);
ulong writeBytesLeft = GetWritableBytes(fileDescriptor);
byte[] outputBuffer = new byte[BUFFER_SIZE];
long totalWritten = 0;
ulong totalWritten = 0;
// Cache the expected values
ulong storedSize = readBytesLeft;
// Read while there are bytes remaining
while (readBytesLeft > 0 && writeBytesLeft > 0)
while (readBytesLeft > 0 && readBytesLeft <= storedSize)
{
uint bytesToWrite = BUFFER_SIZE;
int result;
@@ -372,7 +375,7 @@ namespace SabreTools.Serialization.Wrappers
}
// Validate the number of bytes written
if ((long)fileDescriptor.ExpandedSize != totalWritten)
if (fileDescriptor.ExpandedSize != totalWritten)
if (includeDebug) Console.WriteLine($"Expanded size of file {index} ({GetFileName(index)}) expected to be {fileDescriptor.ExpandedSize}, but was {totalWritten}");
// Finalize output values
@@ -466,7 +469,7 @@ namespace SabreTools.Serialization.Wrappers
if (err != zlibConst.Z_OK)
return err;
err = ZLib.inflate(stream, 1);
err = ZLib.inflate(stream, zlibConst.Z_FINISH);
if (err != zlibConst.Z_OK && err != zlibConst.Z_STREAM_END)
{
ZLib.inflateEnd(stream);
@@ -504,7 +507,7 @@ namespace SabreTools.Serialization.Wrappers
while (stream.avail_in > 1)
{
err = ZLib.inflate(stream, 1);
err = ZLib.inflate(stream, zlibConst.Z_BLOCK);
if (err != zlibConst.Z_OK)
{
ZLib.inflateEnd(stream);
@@ -717,6 +720,7 @@ namespace SabreTools.Serialization.Wrappers
return false;
// Set the number of bytes left
start += bytesToRead;
bytesLeft -= bytesToRead;
_volumeBytesLeft -= (uint)bytesToRead;
}
@@ -777,7 +781,7 @@ namespace SabreTools.Serialization.Wrappers
ulong volumeBytesLeftCompressed, volumeBytesLeftExpanded;
#if NET20 || NET35
if ((_fileDescriptor.Flags & FileFlags.FILE_SPLIT) != 0)
if ((_fileDescriptor.Flags & FileFlags.FILE_SPLIT) != 0)
#else
if (_fileDescriptor.Flags.HasFlag(FileFlags.FILE_SPLIT))
#endif