Fix #1394: bad error for extra close marker (#1395)

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -22,6 +22,8 @@ a pure JSON library.
  (contributed by Eduard G)
 #1361: `JsonPointer` parsing of '~' not followed by "0" or "1" unexpected
  (reported by @slz30)
+#1394: Wrong/misleading error for "extra" close token (`]` or `}`) when
+  at root level
 
 2.18.3 (not yet released)
 

src/main/java/com/fasterxml/jackson/core/base/ParserBase.java

@@ -1389,13 +1389,27 @@ protected char _handleUnrecognizedCharacterEscape(char ch) throws JsonProcessing
 
     protected void _reportMismatchedEndMarker(int actCh, char expCh) throws JsonParseException {
         final JsonReadContext ctxt = getParsingContext();
+
+        // 31-Jan-2025, tatu: [core#1394] Need to check case of no open scope
+        if (ctxt.inRoot()) {
+            _reportExtraEndMarker(actCh);
+            return;
+        }
         final String msg = String.format(
                 "Unexpected close marker '%s': expected '%c' (for %s starting at %s)",
                 (char) actCh, expCh, ctxt.typeDesc(),
                 ctxt.startLocation(_contentReference()));
         throw _constructReadException(msg, _currentLocationMinusOne());
     }
 
+    // @since 2.19
+    protected void _reportExtraEndMarker(int actCh) throws JsonParseException {
+        final String scopeDesc = (actCh == '}') ? "Object" : "Array";
+        final String msg = String.format(
+                "Unexpected close marker '%s': no open %s to close", (char) actCh, scopeDesc);
+        throw _constructReadException(msg, _currentLocationMinusOne());
+    }
+
     /**
      * Method called to report a problem with unquoted control character.
      * Note: it is possible to suppress some instances of

src/test/java/com/fasterxml/jackson/core/read/ParserScopeMatchingTest.java

@@ -6,6 +6,7 @@
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.exc.StreamReadException;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
@@ -188,4 +189,50 @@ private void _testMisssingColon(int mode) throws Exception
         }
         p.close();
     }
+
+    // [core#1394]
+    @Test
+    void extraEndArray() throws Exception
+    {
+        for (int mode : ALL_MODES) {
+            _extraEndArray(mode);
+        }
+    }
+
+    public void _extraEndArray(int mode) throws Exception
+    {
+        try (JsonParser p = createParser(mode, "{ }]")) {
+            assertToken(JsonToken.START_OBJECT, p.nextToken());
+            assertToken(JsonToken.END_OBJECT, p.nextToken());
+            try {
+                p.nextToken();
+                fail("Should have thrown an exception");
+            } catch (StreamReadException e) {
+                verifyException(e, "Unexpected close marker ']': no open Array");
+            }
+        }
+    }
+
+    // [core#1394]
+    @Test
+    void extraEndObject() throws Exception
+    {
+        for (int mode : ALL_MODES) {
+            _extraEndObject(mode);
+        }
+    }
+
+    public void _extraEndObject(int mode) throws Exception
+    {
+        try (JsonParser p = createParser(mode, "[ ]}")) {
+            assertToken(JsonToken.START_ARRAY, p.nextToken());
+            assertToken(JsonToken.END_ARRAY, p.nextToken());
+            try {
+                p.nextToken();
+                fail("Should have thrown an exception");
+            } catch (StreamReadException e) {
+                verifyException(e, "Unexpected close marker '}': no open Object");
+            }
+        }
+    }
 }