Trap regex error.

vassalengine · Sep 18, 2023 · 7ccef13 · 7ccef13
1 parent b8c3441
commit 7ccef13
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/vassal-app/src/main/java/VASSAL/configure/ConfigureTree.java b/vassal-app/src/main/java/VASSAL/configure/ConfigureTree.java
@@ -2662,15 +2662,17 @@ else if (c instanceof PrototypeDefinition) {
      */
     private boolean checkString(String target, String searchString) {
       if (searchParameters.isMatchRegex()) {
-        // patch search string to avoid exception when Regex starts with * only
-        if (searchString.substring(0, 1).equals("*")) {
-          searchString = "." + searchString;
-        }
-        if (searchParameters.isMatchCase()) {
-          return target.matches(searchString);
+        try {
+          if (searchParameters.isMatchCase()) {
+            return target.matches(searchString);
+          }
+          else {
+            return target.toLowerCase().matches(searchString.toLowerCase());
+          }
         }
-        else {
-          return target.toLowerCase().matches(searchString.toLowerCase());
+        catch (java.util.regex.PatternSyntaxException e) {
+          logger.error("Search string is not a valid Regular Expression: " + e.getMessage()); //NON-NLS
+          return false;
         }
       }
       else {