Changeset 11562 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java

Timestamp:

2017-02-14T23:00:03+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #14368 - java.util.regex.PatternSyntaxException: Unclosed group

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java

@@ -14 +14 @@
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
 
 import org.openstreetmap.josm.Main;
@@ -51 +52 @@
      * @param considerValAsKey whether to consider {@code v} as another key and compare the values of key {@code k} and key {@code v}.
      * @return The new condition.
+     * @throws MapCSSException if the arguments are incorrect
      */
     public static Condition createKeyValueCondition(String k, String v, Op op, Context context, boolean considerValAsKey) {
         switch (context) {
         case PRIMITIVE:
-            if (KeyValueRegexpCondition.SUPPORTED_OPS.contains(op) && !considerValAsKey)
-                return new KeyValueRegexpCondition(k, v, op, false);
+            if (KeyValueRegexpCondition.SUPPORTED_OPS.contains(op) && !considerValAsKey) {
+                try {
+                    return new KeyValueRegexpCondition(k, v, op, false);
+                } catch (PatternSyntaxException e) {
+                    throw new MapCSSException(e);
+                }
+            }
             if (!considerValAsKey && op.equals(Op.EQ))
                 return new SimpleKeyValueCondition(k, v);
@@ -339 +346 @@
          * @param op operation
          * @param considerValAsKey must be false
+         * @throws PatternSyntaxException if the value syntax is invalid
          */
         public KeyValueRegexpCondition(String k, String v, Op op, boolean considerValAsKey) {