Changeset 16908 in josm for trunk

Timestamp:

2020-08-23T12:39:30+02:00 (4 years ago)

Author:

simon04

Message:

fix #19685, see #11593 - Fix NPE in JavaCC ParseException

Location:

trunk

Files:

• build.xml (modified) (1 diff)
• tools/javacc/templates/ParseException.template (modified) (1 diff)

trunk/build.xml

@@ -248 +248 @@
         <mkdir dir="${mapcss.dir}/parsergen"/>
         <java classname="javacc" fork="true" failonerror="true">
+            <classpath path="${tools.dir}/javacc"/>
             <classpath refid="javacc.classpath"/>
             <arg value="-DEBUG_PARSER=false"/>

trunk/tools/javacc/templates/ParseException.template

@@ -120 +120 @@
     }
 #if KEEP_LINE_COLUMN
-    retval += "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn;
+    if (currentToken.next != null) {
+      retval += "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn;
+    }
 #fi
     retval += "." + EOL;