Merge pull request #226 from insylogo/master

piksel · web-flow · commit e831547c45c0 · 2018-07-12T14:10:05.000+02:00
Fixes issue #164 by not accessing stream position to determine central signature offset (instead, use central directory offset + size of all entries)
diff --git a/src/ICSharpCode.SharpZipLib/Zip/ZipHelperStream.cs b/src/ICSharpCode.SharpZipLib/Zip/ZipHelperStream.cs
@@ -290,7 +290,7 @@ public long LocateBlockWithSignature(int signature, long endLocation, int minimu
 		/// <param name="centralDirOffset">The offset of the dentral directory.</param>
 		public void WriteZip64EndOfCentralDirectory(long noOfEntries, long sizeEntries, long centralDirOffset)
 		{
-			long centralSignatureOffset = stream_.Position;
+			long centralSignatureOffset = centralDirOffset + sizeEntries;
 			WriteLEInt(ZipConstants.Zip64CentralFileHeaderSignature);
 			WriteLELong(44);    // Size of this record (total size of remaining fields in header or full size - 12)
 			WriteLEShort(ZipConstants.VersionMadeBy);   // Version made by

Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ public long LocateBlockWithSignature(int signature, long endLocation, int minimu`
`290`	`290`	`/// <param name="centralDirOffset">The offset of the dentral directory.</param>`
`291`	`291`	`public void WriteZip64EndOfCentralDirectory(long noOfEntries, long sizeEntries, long centralDirOffset)`
`292`	`292`	`{`
`293`		`- long centralSignatureOffset = stream_.Position;`
	`293`	`+ long centralSignatureOffset = centralDirOffset + sizeEntries;`
`294`	`294`	`WriteLEInt(ZipConstants.Zip64CentralFileHeaderSignature);`
`295`	`295`	`WriteLELong(44); // Size of this record (total size of remaining fields in header or full size - 12)`
`296`	`296`	`WriteLEShort(ZipConstants.VersionMadeBy); // Version made by`