h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 16:25:32 +08:00
Code Issues Releases Wiki Activity

Recommended fixes (obsolete try/catch, fix infinite loop during variable parsing in a better way)

Browse Source
This commit is contained in:
MillhioreF 2017-08-13 00:40:05 -05:00
parent e42c279229
commit e216bfcf10
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Beatmaps/BeatmapManager.cs
View File

@ -307,16 +307,10 @@ namespace osu.Game.Beatmaps
/// <returns>The imported beatmap, or an existing instance if it is already present.</returns> /// <returns>The imported beatmap, or an existing instance if it is already present.</returns>
private BeatmapSetInfo importToStorage(ArchiveReader reader) private BeatmapSetInfo importToStorage(ArchiveReader reader)
{ {
string mapName;
// let's make sure there are actually .osu files to import. // let's make sure there are actually .osu files to import.
try string mapName = reader.Filenames.FirstOrDefault(f => f.EndsWith(".osu"));
{ if (string.IsNullOrEmpty(mapName))
mapName = reader.Filenames.First(f => f.EndsWith(".osu"));
}
catch
{
throw new InvalidOperationException("No beatmap files found in the map folder."); throw new InvalidOperationException("No beatmap files found in the map folder.");
}
// for now, concatenate all .osu files in the set to create a unique hash. // for now, concatenate all .osu files in the set to create a unique hash.
MemoryStream hashable = new MemoryStream(); MemoryStream hashable = new MemoryStream();

4
osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs
View File

@ -222,8 +222,9 @@ namespace osu.Game.Beatmaps.Formats
/// <param name="line">The line which may contains variables.</param> /// <param name="line">The line which may contains variables.</param>
private void decodeVariables(ref string line) private void decodeVariables(ref string line)
{ {
if (line.IndexOf('$') >= 0) while (line.IndexOf('$') >= 0)
{ {
string origLine = line;
string[] split = line.Split(','); string[] split = line.Split(',');
for (int i = 0; i < split.Length; i++) for (int i = 0; i < split.Length; i++)
{ {
@ -233,6 +234,7 @@ namespace osu.Game.Beatmaps.Formats
} }
line = string.Join(",", split); line = string.Join(",", split);
if (line == origLine) break;
} }
} }