epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ZipFile is now determined by a zip header, not the file extensions, as it may be a temp file.

Browse Source
This commit is contained in:
IceReaper
2022-11-07 18:34:37 +01:00
committed by Gustas
parent 0aced08204
commit 98e7058486
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenRA.Game/FileSystem/ZipFile.cs
View File

@@ -19,7 +19,7 @@ namespace OpenRA.FileSystem
{ {
public class ZipFileLoader : IPackageLoader public class ZipFileLoader : IPackageLoader
{ {
static readonly string[] Extensions = { ".zip", ".oramap" }; static readonly uint ZipSignature = 0x04034b50;
class ReadOnlyZipFile : IReadOnlyPackage class ReadOnlyZipFile : IReadOnlyPackage
{ {
@@ -206,7 +206,10 @@ namespace OpenRA.FileSystem
public bool TryParsePackage(Stream s, string filename, FileSystem context, out IReadOnlyPackage package) public bool TryParsePackage(Stream s, string filename, FileSystem context, out IReadOnlyPackage package)
{ {
if (!Extensions.Any(e => filename.EndsWith(e, StringComparison.InvariantCultureIgnoreCase))) var readSignature = s.ReadUInt32();
s.Position -= 4;
if (readSignature != ZipSignature)
{ {
package = null; package = null;
return false; return false;
@@ -218,10 +221,15 @@ namespace OpenRA.FileSystem
public static bool TryParseReadWritePackage(string filename, out IReadWritePackage package) public static bool TryParseReadWritePackage(string filename, out IReadWritePackage package)
{ {
if (!Extensions.Any(e => filename.EndsWith(e, StringComparison.InvariantCultureIgnoreCase))) using (var s = File.OpenRead(filename))
{ {
package = null; var readSignature = s.ReadUInt32();
return false;
if (readSignature != ZipSignature)
{
package = null;
return false;
}
} }
package = new ReadWriteZipFile(filename); package = new ReadWriteZipFile(filename);