Fixed port RegExp accepting values that are too high

burdoto · Oct 10, 2019 · a43a850 · a43a850
1 parent a2fbc8e
commit a43a850
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/VBANDeck/SendBasicScript.cs b/VBANDeck/SendBasicScript.cs
@@ -141,17 +141,18 @@ public string PortProperty
                         return;
                     }
 
-                    if (Regex.IsMatch(value, "[0-9]{1,6}"))
+                    int port;
+                    if (Regex.IsMatch(value, "[0-9]{1,5}") 
+                        && (port = int.Parse(value)) <= 65535)
                     {
-                        Port = int.Parse(value);
-                    }
-                    else
-                    {
-                        Logger.Instance.LogMessage(TracingLevel.WARN,
-                            "Invalid Port [" + value + "] was entered! Falling back to " +
-                            VBAN.DefaultPort);
-                        Port = VBAN.DefaultPort;
+                        Port = port;
+                        return;
                     }
+
+                    Logger.Instance.LogMessage(TracingLevel.WARN,
+                        "Invalid Port [" + value + "] was entered! Falling back to " +
+                        VBAN.DefaultPort);
+                    Port = VBAN.DefaultPort;
                 }
             }