Changeset 18202 in josm for trunk/src/org

Timestamp:

2021-09-08T13:55:01+02:00 (3 years ago)

Author:

Don-vip

Message:

see #21300 - fix potential NPE detected by coverity

File:

• trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java

@@ -2150 +2150 @@
                 UnaryMatchFactory unaryFactory = unaryMatchFactoryMap.get(key);
                 if (unaryFactory != null)
-                    return unaryFactory.get(key, parseFactor(), tokenizer).validate();
+                    return getValidate(unaryFactory, key, tokenizer);
 
                 // key:value form where value is a string (may be OSM key search)
@@ -2164 +2164 @@
                 UnaryMatchFactory unaryFactory = unaryMatchFactoryMap.get(key);
                 if (unaryFactory != null)
-                    return unaryFactory.get(key, parseFactor(), null).validate();
+                    return getValidate(unaryFactory, key, null);
 
                 // match string in any key or value
@@ -2175 +2175 @@
     private Match parseFactor(String errorMessage) throws SearchParseError {
         return Optional.ofNullable(parseFactor()).orElseThrow(() -> new SearchParseError(errorMessage));
+    }
+
+    private Match getValidate(UnaryMatchFactory unaryFactory, String key, PushbackTokenizer tokenizer)
+            throws SearchParseError {
+        UnaryMatch match = unaryFactory.get(key, parseFactor(), tokenizer);
+        return match != null ? match.validate() : null;
     }