RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add a bit more safety to argument parsing logic

This commit is contained in:
Dean Herbert 2021-07-21 15:02:15 +09:00
parent ebd555129f
commit 4148d3fdac
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
osu.Desktop/Program.cs
View File

@ -17,18 +17,25 @@ namespace osu.Desktop
{
public static class Program
{
private const string base_game_name = @"osu";
[STAThread]
public static int Main(string[] args)
{
// Back up the cwd before DesktopGameHost changes it
var cwd = Environment.CurrentDirectory;
string gameName = @"osu";
string gameName = base_game_name;
bool tournamentClient = false;
foreach (var arg in args.Select(s => s.Split('=')))
foreach (var arg in args)
{
switch (arg[0])
var split = arg.Split('=');
var key = split[0];
var val = split[1];
switch (key)
{
case "--tournament":
tournamentClient = true;
@ -36,9 +43,12 @@ public static int Main(string[] args)
case "--debug-client-id":
if (!DebugUtils.IsDebugBuild)
break;
throw new InvalidOperationException("Cannot use this argument in a non-debug build.");
gameName = $"{gameName}-{int.Parse(arg[1])}";
if (!int.TryParse(val, out int clientID))
throw new ArgumentException("Provided client ID must be an integer.");
gameName = $"{base_game_name}-{clientID}";
break;
}
}