Changeset 17832 in josm

Timestamp:

2021-04-27T19:13:50+02:00 (5 years ago)

Author:

simon04

Message:

see #20744, fix #20810 - MapCSS: fix NPE

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.java (modified) (2 diffs)

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

@@ -60 +60 @@
                     return identity;
                 } else if (args.size() == 1) {
-                    return unaryOperator.applyAsDouble(Cascade.convertTo(args.get(0).evaluate(env), Double.class));
+                    Double arg = Cascade.convertTo(args.get(0).evaluate(env), Double.class);
+                    return arg == null ? null : unaryOperator.applyAsDouble(arg);
                 } else {
                     return args.stream()

trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.java

@@ -612 +612 @@
                 "neg: -13;" +
                 "not: !0;" +
+                "null0: -tag(does_not_exist);" +
                 "null1: tag(x1) + tag(x2);" +
                 "null2: 3 + tag(does_not_exist) + 5;" +
@@ -624 +625 @@
         assertEquals(-13.0, mc.getCascade(null).get("neg"));
         assertEquals(true, mc.getCascade(null).get("not"));
+        assertNull(mc.getCascade(null).get("null0"));
         assertNull(mc.getCascade(null).get("null1"));
         assertEquals(8.0, mc.getCascade(null).get("null2"));