github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed nullrefs in command parsing

Browse Source
This commit is contained in:
RogueException
2016-08-21 11:07:32 -03:00
parent 324664917d
commit 99e9c36a69
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Discord.Net.Commands/CommandParser.cs
View File

@@ -156,7 +156,7 @@ namespace Discord.Commands
return ParseResult.FromError(CommandError.ParseFailed, "A quoted parameter is incomplete"); return ParseResult.FromError(CommandError.ParseFailed, "A quoted parameter is incomplete");
//Add missing optionals //Add missing optionals
for (int i = paramList.Count; i < command.Parameters.Count; i++) for (int i = argList.Count; i < command.Parameters.Count; i++)
{ {
var param = command.Parameters[i]; var param = command.Parameters[i];
if (!param.IsOptional) if (!param.IsOptional)

10
src/Discord.Net.Commands/Results/ParseResult.cs
View File

@@ -41,9 +41,13 @@ namespace Discord.Commands
var argList = new TypeReaderResult[argValues.Count]; var argList = new TypeReaderResult[argValues.Count];
for (int i = 0; i < argValues.Count; i++) for (int i = 0; i < argValues.Count; i++)
argList[i] = TypeReaderResult.FromSuccess(argValues[i]); argList[i] = TypeReaderResult.FromSuccess(argValues[i]);
var paramList = new TypeReaderResult[paramValues.Count]; TypeReaderResult[] paramList = null;
for (int i = 0; i < paramValues.Count; i++) if (paramValues != null)
paramList[i] = TypeReaderResult.FromSuccess(paramValues[i]); {
paramList = new TypeReaderResult[paramValues.Count];
for (int i = 0; i < paramValues.Count; i++)
paramList[i] = TypeReaderResult.FromSuccess(paramValues[i]);
}
return new ParseResult(argList, paramList, null, null); return new ParseResult(argList, paramList, null, null);
} }