From 120950b539a18853397831c809d37045f88ef0f2 Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Fri, 1 Jan 2016 19:42:09 -0400
Subject: [PATCH] Fixed a couple parser errors

---
 src/Discord.Net.Commands/CommandParser.cs | 27 ++++++++++++++---------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/Discord.Net.Commands/CommandParser.cs b/src/Discord.Net.Commands/CommandParser.cs
index fbd7f2fc2..cfdbe6903 100644
--- a/src/Discord.Net.Commands/CommandParser.cs
+++ b/src/Discord.Net.Commands/CommandParser.cs
@@ -119,13 +119,13 @@ namespace Discord.Commands
 						else if ((!isEscaped && isWhitespace) || endPosition >= inputLength)
 						{
 							int length = (isWhitespace ? endPosition - 1 : endPosition) - startPosition;
-							string temp = input.Substring(startPosition, length);
-							if (temp == "")
+                            if (length == 0)
 								startPosition = endPosition;
 							else
-							{
-								currentPart = ParserPart.None;
-								argList.Add(temp);
+                            {
+                                string temp = input.Substring(startPosition, length);
+                                argList.Add(temp);
+                                currentPart = ParserPart.None;
 								startPosition = endPosition;
 							}
 						} 
@@ -134,9 +134,9 @@ namespace Discord.Commands
 						if ((!isEscaped && currentChar == '\''))
 						{
 							string temp = input.Substring(startPosition, endPosition - startPosition - 1);
-							currentPart = ParserPart.None;
 							argList.Add(temp);
-							startPosition = endPosition;
+                            currentPart = ParserPart.None;
+                            startPosition = endPosition;
 						}
 						else if (endPosition >= inputLength)
 							return CommandErrorType.InvalidInput;
@@ -145,9 +145,9 @@ namespace Discord.Commands
 						if ((!isEscaped && currentChar == '\"'))
 						{
 							string temp = input.Substring(startPosition, endPosition - startPosition - 1);
-							currentPart = ParserPart.None;
 							argList.Add(temp);
-							startPosition = endPosition;
+                            currentPart = ParserPart.None;
+                            startPosition = endPosition;
 						}
 						else if (endPosition >= inputLength)
 							return CommandErrorType.InvalidInput;
@@ -155,8 +155,13 @@ namespace Discord.Commands
 				}
 			}
 
-			//Too few args
-			for (int i = argList.Count; i < expectedArgs.Length; i++)
+            //Unclosed quotes
+            if (currentPart == ParserPart.QuotedParameter || 
+                currentPart == ParserPart.DoubleQuotedParameter)
+                return CommandErrorType.InvalidInput;
+
+            //Too few args
+            for (int i = argList.Count; i < expectedArgs.Length; i++)
 			{
 				var param = expectedArgs[i];
 				switch (param.Type)