- fixed reading of extended EndOfCentralDirectory

source/common/filesystem/file_zip.cpp

@@ -145,16 +145,18 @@ static uint32_t Zip_FindCentralDir(FileReader &fin, bool* zip64)
 
 		for (i = (int)uReadSize - 3; (i--) > 0;)
 		{
-			if (buf[i] == 'P' && buf[i+1] == 'K' && (buf[i+2] == 5 || buf[i+2] == 6) && buf[i+3] == 6)
+			if (buf[i] == 'P' && buf[i+1] == 'K' && buf[i+2] == 5 && buf[i+3] == 6 && !*zip64 && uPosFound == 0)
 			{
-				*zip64 = buf[i+2] == 6;
+				*zip64 = false;
 				uPosFound = uReadPos + i;
-				break;
+			}
+			if (buf[i] == 'P' && buf[i+1] == 'K' && buf[i+2] == 6 && buf[i+3] == 6)
+			{
+				*zip64 = true;
+				uPosFound = uReadPos + i;
+				return uPosFound;
 			}
 		}
-
-		if (uPosFound != 0)
-			break;
 	}
 	return uPosFound;
 }
@@ -210,7 +212,7 @@ bool FZipFile::Open(bool quiet, LumpFilterInfo* filter)
 		FZipEndOfCentralDirectory64 info;
 		// Read the central directory info.
 		Reader.Seek(centraldir, FileReader::SeekSet);
-		Reader.Read(&info, sizeof(FZipEndOfCentralDirectory));
+		Reader.Read(&info, sizeof(FZipEndOfCentralDirectory64));
 
 		// No multi-disk zips!
 		if (info.NumEntries != info.NumEntriesOnAllDisks ||
@@ -220,7 +222,7 @@ bool FZipFile::Open(bool quiet, LumpFilterInfo* filter)
 			return false;
 		}
 
-		NumLumps = LittleLong(info.NumEntries);
+		NumLumps = info.NumEntries;
 		dirsize = info.DirectorySize;
 		DirectoryOffset = info.DirectoryOffset;
 	}

source/common/filesystem/w_zip.h

@@ -20,13 +20,13 @@ struct FZipEndOfCentralDirectory
 struct FZipEndOfCentralDirectory64
 {
 	uint32_t	Magic;
-	uint32_t	StructSize;
+	uint64_t	StructSize;
 	uint16_t	VersionMadeBy;
 	uint16_t	VersionNeeded;
 	uint32_t	DiskNumber;
 	uint32_t	FirstDisk;
-	uint32_t	NumEntries;
-	uint32_t	NumEntriesOnAllDisks;
+	uint64_t	NumEntries;
+	uint64_t	NumEntriesOnAllDisks;
 	uint64_t	DirectorySize;
 	uint64_t	DirectoryOffset;
 	uint16_t	ZipCommentLength;