Changeset 15113 in josm for trunk

Timestamp:

2019-05-25T20:17:02+02:00 (6 years ago)

Author:

GerdP

Message:

fix #17746: Detect invalid MapCSS search expressions

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/search/SearchCompiler.java (modified) (1 diff)
• gui/mappaint/mapcss/MapCSSParser.jj (modified) (1 diff)

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

@@ -1996 +1996 @@
     static Match compileMapCSS(String mapCSS) throws SearchParseError {
         try {
-            final List<Selector> selectors = new MapCSSParser(new StringReader(mapCSS)).selectors();
+            final List<Selector> selectors = new MapCSSParser(new StringReader(mapCSS)).selectors_for_search();
             return new Match() {
                 @Override

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj

@@ -655 +655 @@
         }
     }
+}
+
+/** Read selectors, make sure that we read all tokens  See #17746 */
+List<Selector> selectors_for_search():
+{
+    List<Selector> selectors;
+}
+{
+    selectors=selectors() <EOF>
+    { return selectors; }
 }