Changeset 7300 in josm

Timestamp:

2014-07-09T22:30:40+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #10251 - NPE with malformed validator rule (invalid fixAdd/fixRemove)

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

@@ -216 +216 @@
                     } else if ("fixAdd".equals(ai.key)) {
                         final PrimitiveToTag toTag = PrimitiveToTag.ofMapCSSObject(ai.val, false);
-                        check.change.add(toTag);
+                        if (toTag != null) {
+                            check.change.add(toTag);
+                        } else {
+                            Main.warn("Invalid value for "+ai.key+": "+ai.val);
+                        }
                     } else if ("fixRemove".equals(ai.key)) {
                         CheckParameterUtil.ensureThat(!(ai.val instanceof String) || !(val != null && val.contains("=")),
                                 "Unexpected '='. Please only specify the key to remove!");
                         final PrimitiveToTag toTag = PrimitiveToTag.ofMapCSSObject(ai.val, true);
-                        check.change.add(toTag);
+                        if (toTag != null) {
+                            check.change.add(toTag);
+                        } else {
+                            Main.warn("Invalid value for "+ai.key+": "+ai.val);
+                        }
                     } else if ("fixChangeKey".equals(ai.key) && val != null) {
                         CheckParameterUtil.ensureThat(val.contains("=>"), "Separate old from new key by '=>'!");