Changeset 18876 in josm for trunk

Timestamp:

2023-10-24T15:50:05+02:00 (17 months ago)

Author:

taylor.smock

Message:

See #23238: Some MapCSS functions cause NPEs when part of fixAdd

JOSM_Search doesn't trigger the issue unless the search string is non-empty.

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/mappaint/mapcss/Functions.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/FunctionsTest.java (modified) (2 diffs)

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

@@ -629 +629 @@
      */
     public static boolean has_tag_key(final Environment env, String key) {
-        return env.osm != null ? env.osm.hasKey(key) : false;
+        return env.osm != null && env.osm.hasKey(key);
     }
 
@@ -852 +852 @@
      */
     public static Boolean JOSM_search(final Environment env, String searchStr) {
+        if (env.osm == null) {
+            return null;
+        }
         Match m;
         try {

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

@@ -260 +260 @@
     /**
      * Non-regression test for #23238: NPE when env.osm is null
+     * @see #testNonRegression23238JOSMSearch()
      */
     @ParameterizedTest
@@ -288 +289 @@
         }
     }
+
+    /**
+     * Non-regression test for #23238: NPE when env.osm is null and {@link Functions#JOSM_search(Environment, String)}
+     * has a non-empty search string.
+     * @see #testNonRegression23238(Method)
+     */
+    @Test
+    void testNonRegression23238JOSMSearch() {
+        assertDoesNotThrow(() -> Functions.JOSM_search(new Environment(), "foobar"));
+    }
 }