GROOVY-11123: allow EOF terminated Number tokens in JsonLexer

apache · Jul 14, 2023 · 47b07c5 · 47b07c5
1 parent 0833d0e
commit 47b07c5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/subprojects/groovy-json/src/main/java/groovy/json/JsonLexer.java b/subprojects/groovy-json/src/main/java/groovy/json/JsonLexer.java
@@ -130,7 +130,10 @@ public JsonToken nextToken() {
                 for (;;) {
                     reader.mark(1);
                     int read = reader.read();
-                    if (read == -1) return null;
+                    if (read == -1) {
+                        if (currentContent.length() == 0) return null;
+                        read = 32;
+                    }
                     char lastCharRead = (char) read;
 
                     if (lastCharRead >= ZERO && lastCharRead <= NINE ||

diff --git a/subprojects/groovy-json/src/test/groovy/groovy/json/JsonLexerTest.groovy b/subprojects/groovy-json/src/test/groovy/groovy/json/JsonLexerTest.groovy
@@ -48,13 +48,13 @@ class JsonLexerTest extends GroovyTestCase {
     }
 
     void testNextToken() {
-        def content = [" true ", " false ", " null ", " -123.456e78 ", " [ ", " ] ", " { ", " } ", " : ", " , "]
+        def content = [" true ", "true", " false ", "false", " null ", "null", " -123.456e78 ", "-123.456e78", " [ ", " ] ", " { ", " } ", " : ", " , "]
 
         assert content.collect {
             def lexer = new JsonLexer(new StringReader(it))
-            lexer.nextToken().type
+            lexer.nextToken()?.type
         } == [
-                TRUE, FALSE, NULL, NUMBER,
+                TRUE, TRUE, FALSE, FALSE, NULL, NULL, NUMBER, NUMBER,
                 OPEN_BRACKET, CLOSE_BRACKET, OPEN_CURLY, CLOSE_CURLY, COLON, COMMA
         ]
     }
@@ -120,7 +120,7 @@ class JsonLexerTest extends GroovyTestCase {
     }
 
     void testUnescapingWithLexer() {
-        // use string concatenation so that the unicode escape characters are not decoded 
+        // use string concatenation so that the unicode escape characters are not decoded
         // by Groovy's lexer but by the JsonLexer
         def lexer = new JsonLexer(new StringReader('"\\' + 'u004A\\' + 'u0053\\' + 'u004F\\' + 'u004E"'))