mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: Zip - gzip unpack progress

Browse source
This commit is contained in:
Alexander Koblov 2022-09-16 18:41:40 +03:00
commit 6011f09b10
1 changed files with 33 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

72
plugins/wcx/zip/src/fparchive/abgztyp.pas
View file

@ -985,6 +985,7 @@ procedure TAbGzipArchive.ExtractItemToStreamAt(Index: Integer;
aStream: TStream);
var
GzHelp : TAbGzipStreamHelper;
ProxyStream : TAbProgressStream;
begin
if IsGzippedTar and TarAutoHandle then begin
SwapToTar;
@ -994,43 +995,48 @@ begin
SwapToGzip;
{ note Index ignored as there's only one item in a GZip }
GZHelp := TAbGzipStreamHelper.Create(FGzStream);
ProxyStream := TAbProgressStream.Create(FGzStream, FOnProgress);
try
FGzStream.Seek(0, soBeginning);
GZHelp := TAbGzipStreamHelper.Create(ProxyStream);
try
FGzStream.Seek(0, soBeginning);
{ read GZip Header }
GzHelp.ReadHeader;
repeat
{ extract copy data from GZip}
GzHelp.ExtractItemData(aStream);
{ Get validation data }
GzHelp.ReadTail;
{$IFDEF STRICTGZIP}
{ According to
http://www.gzip.org/zlib/rfc1952.txt
A compliant gzip compressor should calculate and set the CRC32 and ISIZE.
However, a compliant decompressor should not check these values.
If you want to check the the values of the CRC32 and ISIZE in a GZIP file
when decompressing enable the STRICTGZIP define contained in AbDefine.inc }
{ validate against CRC }
if GzHelp.FItem.Crc32 <> GzHelp.TailCRC then
raise EAbGzipBadCRC.Create;
{ validate against file size }
if GzHelp.FItem.UncompressedSize <> GZHelp.TailSize then
raise EAbGzipBadFileSize.Create;
{$ENDIF}
{ try concatenated streams }
{ read GZip Header }
GzHelp.ReadHeader;
until not VerifyHeader(GZHelp.FItem.FGzHeader);
repeat
{ extract copy data from GZip}
GzHelp.ExtractItemData(aStream);
{ Get validation data }
GzHelp.ReadTail;
{$IFDEF STRICTGZIP}
{ According to
http://www.gzip.org/zlib/rfc1952.txt
A compliant gzip compressor should calculate and set the CRC32 and ISIZE.
However, a compliant decompressor should not check these values.
If you want to check the the values of the CRC32 and ISIZE in a GZIP file
when decompressing enable the STRICTGZIP define contained in AbDefine.inc }
{ validate against CRC }
if GzHelp.FItem.Crc32 <> GzHelp.TailCRC then
raise EAbGzipBadCRC.Create;
{ validate against file size }
if GzHelp.FItem.UncompressedSize <> GZHelp.TailSize then
raise EAbGzipBadFileSize.Create;
{$ENDIF}
{ try concatenated streams }
GzHelp.ReadHeader;
until not VerifyHeader(GZHelp.FItem.FGzHeader);
finally
GzHelp.Free;
end;
finally
GzHelp.Free;
ProxyStream.Free;
end;
end;
end;