pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

Fixes reading of ZIPs with "wrong" local header information (size, crc, ...), as unzip.exe use the data from Central header instead.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@948 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
Joshy
2009-09-02 01:19:46 +00:00
parent d7c494635e
commit 9c7a5199c7
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
components/fpspreadsheet/fpszipper.pp
View File

@ -259,11 +259,13 @@ Type
FDateTime: TDateTime; FDateTime: TDateTime;
FDiskFileName: String; FDiskFileName: String;
FHeaderPos: Longint; FHeaderPos: Longint;
FCentralPos: LongInt;
FSize: Integer; FSize: Integer;
FStream: TStream; FStream: TStream;
function GetArchiveFileName: String; function GetArchiveFileName: String;
Protected Protected
Property HdrPos : Longint Read FHeaderPos Write FheaderPos; Property HdrPos : Longint Read FHeaderPos Write FheaderPos;
property CentralPos: LongInt read FCentralPos write FCentralPos;
Public Public
Procedure Assign(Source : TPersistent); override; Procedure Assign(Source : TPersistent); override;
Property Stream : TStream Read FStream Write FStream; Property Stream : TStream Read FStream Write FStream;
@ -604,7 +606,6 @@ Var
Buf : PByte; Buf : PByte;
I,Count : Integer; I,Count : Integer;
C : TDeCompressionStream; C : TDeCompressionStream;
begin begin
CRC32Val:=$FFFFFFFF; CRC32Val:=$FFFFFFFF;
Buf:=GetMem(FBufferSize); Buf:=GetMem(FBufferSize);
@ -1401,8 +1402,9 @@ Procedure TUnZipper.ReadZipHeader(Item : TZipFileEntry; out ACRC : LongWord; out
Var Var
S : String; S : String;
D : TDateTime; D : TDateTime;
Begin Begin
FZipFile.Seek(Item.CentralPos,soFromBeginning);
FZipFile.ReadBuffer(CentralHdr,SizeOf(CentralHdr));
FZipFile.Seek(Item.HdrPos,soFromBeginning); FZipFile.Seek(Item.HdrPos,soFromBeginning);
FZipFile.ReadBuffer(LocalHdr,SizeOf(LocalHdr)); FZipFile.ReadBuffer(LocalHdr,SizeOf(LocalHdr));
{$IFDEF FPC_BIG_ENDIAN} {$IFDEF FPC_BIG_ENDIAN}
@ -1415,10 +1417,10 @@ Begin
FZipFile.Seek(Extra_Field_Length,soCurrent); FZipFile.Seek(Extra_Field_Length,soCurrent);
Item.ArchiveFileName:=S; Item.ArchiveFileName:=S;
Item.DiskFileName:=S; Item.DiskFileName:=S;
Item.Size:=Uncompressed_Size; Item.Size:=CentralHdr.Uncompressed_Size;
ZipDateTimeToDateTime(Last_Mod_Date,Last_Mod_Time,D); ZipDateTimeToDateTime(Last_Mod_Date,Last_Mod_Time,D);
Item.DateTime:=D; Item.DateTime:=D;
ACrc:=Crc32; ACrc:=CentralHdr.Crc32;
AMethod:=Compress_method; AMethod:=Compress_method;
end; end;
End; End;
@ -1461,6 +1463,7 @@ Begin
raise EZipError.CreateFmt(SErrCorruptZIP,[FZipFile.FileName]); raise EZipError.CreateFmt(SErrCorruptZIP,[FZipFile.FileName]);
NewNode:=FEntries.Add as TZipFileEntry; NewNode:=FEntries.Add as TZipFileEntry;
NewNode.HdrPos := Local_Header_Offset; NewNode.HdrPos := Local_Header_Offset;
NewNode.CentralPos := FZipFile.Position-SizeOf(CentralHdr);
SetLength(S,Filename_Length); SetLength(S,Filename_Length);
FZipFile.ReadBuffer(S[1],Filename_Length); FZipFile.ReadBuffer(S[1],Filename_Length);
NewNode.ArchiveFileName:=S; NewNode.ArchiveFileName:=S;
@ -1495,7 +1498,7 @@ Begin
OpenOutput(OutputFileName); OpenOutput(OutputFileName);
if ZMethod=0 then if ZMethod=0 then
begin begin
Count:=FOutFile.CopyFrom(FZipFile,LocalHdr.Compressed_Size); Count:=FOutFile.CopyFrom(FZipFile,CentralHdr.Compressed_Size);
{$warning TODO: Implement CRC Check} {$warning TODO: Implement CRC Check}
end end
else else