h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-21 01:00:27 +08:00
Code Issues Releases Wiki Activity

Merge pull request #2246 from peppy/bail-on-invalid-archive

Browse Source 
Hard bail on attempting to import an invalid archive format
This commit is contained in:
Dan Balasescu
2018-03-22 11:59:52 +09:00
committed by GitHub
Unverified
parent 606ad4b93b 552e7e314d
commit 2d2b56bb75
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Database/ArchiveModelManager.cs
+4 -1
View File
@@ -13,6 +13,7 @@ using osu.Game.IO;
using osu.Game.IO.Archives;
using osu.Game.IPC;
using osu.Game.Overlays.Notifications;
using SharpCompress.Common;
using FileInfo = osu.Game.IO.FileInfo;
namespace osu.Game.Database
@@ -331,7 +332,9 @@ namespace osu.Game.Database
{
if (ZipFile.IsZipFile(path))
return new ZipArchiveReader(Files.Storage.GetStream(path), Path.GetFileName(path));
return new LegacyFilesystemReader(path);
if (Directory.Exists(path))
return new LegacyFilesystemReader(path);
throw new InvalidFormatException($"{path} is not a valid archive");
}
}
}