🐛 Resolve #16 by adding specific check for Enums

decaprime · Jul 27, 2023 · d715af8 · d715af8
1 parent 41394c5
commit d715af8
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/VCF.Core/Registry/CommandRegistry.cs b/VCF.Core/Registry/CommandRegistry.cs
@@ -164,13 +164,25 @@ static void HandleAfterExecute(ICommandContext ctx, CommandMetadata command)
 					return CommandResult.InternalError;
 				}
 			}
+			// Default Converter
 			else
 			{
-				// default convertet
-				var builtinConverter = TypeDescriptor.GetConverter(param.ParameterType);
+				var defaultConverter = TypeDescriptor.GetConverter(param.ParameterType);
 				try
 				{
-					commandArgs[i + 1] = builtinConverter.ConvertFromInvariantString(arg);
+					var val = defaultConverter.ConvertFromInvariantString(arg);
+
+					// ensure enums are valid for #16
+					if (defaultConverter is EnumConverter)
+					{
+						if (!Enum.IsDefined(param.ParameterType, val))
+						{
+							ctx.Reply($"<color=red>[error]</color> Invalid value {val} for {param.ParameterType.Name}");
+							return CommandResult.UsageError;
+						}
+					}
+
+					commandArgs[i + 1] = val;
 				}
 				catch (Exception e)
 				{