Changeset 18876 in josm for trunk/src/org/openstreetmap

Timestamp:

2023-10-24T15:50:05+02:00 (15 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.

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Functions.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 {