Fixes #1173: column/offset locations wrong for many error conditions (#1176)

cowtowncoder · web-flow · commit 0c715d13f1d1 · 2023-12-27T18:22:08.000-08:00
diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x
@@ -405,3 +405,8 @@ David Schlosnagle (@schlosna)
 Mario Fusco (@mariofusco)
  * Contributed #1064: Add full set of `BufferRecyclerPool` implementations
   (2.16.0)
+
+Paul Bunyan (@hal7df)
+ * Reported #1173: `JsonLocation` consistently off by one character for many invalid
+   JSON parsing cases
+  (2.16.2)
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -14,6 +14,12 @@ a pure JSON library.
 === Releases ===
 ------------------------------------------------------------------------
 
+2.16.2 (not yet released)
+
+#1173: `JsonLocation` consistently off by one character for many invalid JSON
+  parsing cases
+ (reported by Paul B)
+
 2.16.1 (24-Dec-2023)
 
 #1141: NPE in `Version.equals()` if snapshot-info `null`
diff --git a/src/main/java/com/fasterxml/jackson/core/json/ReaderBasedJsonParser.java b/src/main/java/com/fasterxml/jackson/core/json/ReaderBasedJsonParser.java
@@ -769,6 +769,7 @@ public final JsonToken nextToken() throws IOException
         case '}':
             // Error: } is not valid at this point; valid closers have
             // been handled earlier
+            --_inputPtr; // for correct error reporting
             _reportUnexpectedChar(i, "expected a value");
         case 't':
             _matchTrue();
@@ -1455,6 +1456,7 @@ private final JsonToken _parseFloat(int ch, int startPtr, int ptr, boolean neg,
             // must be followed by sequence of ints, one minimum
             if (fractLen == 0) {
                 if (!isEnabled(JsonReadFeature.ALLOW_TRAILING_DECIMAL_POINT_FOR_NUMBERS.mappedFeature())) {
+                    --_inputPtr; // for correct error reporting
                     _reportUnexpectedNumberChar(ch, "Decimal point not followed by a digit");
                 }
             }
@@ -1484,6 +1486,7 @@ private final JsonToken _parseFloat(int ch, int startPtr, int ptr, boolean neg,
             }
             // must be followed by sequence of ints, one minimum
             if (expLen == 0) {
+                --_inputPtr; // for correct error reporting
                 _reportUnexpectedNumberChar(ch, "Exponent indicator not followed by a digit");
             }
         }
@@ -1644,6 +1647,7 @@ private final JsonToken _parseNumber2(boolean neg, int startPtr) throws IOExcept
             // must be followed by sequence of ints, one minimum
             if (fractLen == 0) {
                 if (!isEnabled(JsonReadFeature.ALLOW_TRAILING_DECIMAL_POINT_FOR_NUMBERS.mappedFeature())) {
+                    --_inputPtr; // for correct error reporting
                     _reportUnexpectedNumberChar(c, "Decimal point not followed by a digit");
                 }
             }
@@ -1688,6 +1692,7 @@ private final JsonToken _parseNumber2(boolean neg, int startPtr) throws IOExcept
             }
             // must be followed by sequence of ints, one minimum
             if (expLen == 0) {
+                --_inputPtr; // for correct error reporting
                 _reportUnexpectedNumberChar(c, "Exponent indicator not followed by a digit");
             }
         }
@@ -1788,11 +1793,13 @@ protected JsonToken _handleInvalidNumberStart(int ch, final boolean negative, fi
             }
         }
         if (!isEnabled(JsonReadFeature.ALLOW_LEADING_PLUS_SIGN_FOR_NUMBERS.mappedFeature()) && hasSign && !negative) {
+            --_inputPtr; // for correct error reporting
             _reportUnexpectedNumberChar('+', "JSON spec does not allow numbers to have plus signs: enable `JsonReadFeature.ALLOW_LEADING_PLUS_SIGN_FOR_NUMBERS` to allow");
         }
         final String message = negative ?
                 "expected digit (0-9) to follow minus sign, for valid numeric value" :
                 "expected digit (0-9) for valid numeric value";
+        --_inputPtr; // for correct error reporting
         _reportUnexpectedNumberChar(ch, message);
         return null;
     }
@@ -1940,6 +1947,7 @@ protected String _handleOddName(int i) throws IOException
         }
         // [JACKSON-69]: allow unquoted names if feature enabled:
         if ((_features & FEAT_MASK_ALLOW_UNQUOTED_NAMES) == 0) {
+            --_inputPtr; // for correct error reporting
             _reportUnexpectedChar(i, "was expecting double-quote to start field name");
         }
         final int[] codes = CharTypes.getInputCodeLatin1JsNames();
@@ -1954,6 +1962,7 @@ protected String _handleOddName(int i) throws IOException
             firstOk = Character.isJavaIdentifierPart((char) i);
         }
         if (!firstOk) {
+            --_inputPtr; // for correct error reporting
             _reportUnexpectedChar(i, "was expecting either valid name character (for unquoted name) or double-quote (for quoted) to start field name");
         }
         int ptr = _inputPtr;
@@ -2085,6 +2094,7 @@ protected JsonToken _handleOddValue(int i) throws IOException
             _reportInvalidToken(""+((char) i), _validJsonTokenList());
         }
         // but if it doesn't look like a token:
+        --_inputPtr; // for correct error reporting
         _reportUnexpectedChar(i, "expected a valid value "+_validJsonValueList());
         return null;
     }
@@ -2387,6 +2397,7 @@ private final int _skipColon2(boolean gotColon) throws IOException
                     return i;
                 }
                 if (i != INT_COLON) {
+                    --_inputPtr; // for correct error reporting
                     _reportUnexpectedChar(i, "was expecting a colon to separate field name and value");
                 }
                 gotColon = true;
@@ -2460,6 +2471,7 @@ private final int _skipColonFast(int ptr) throws IOException
     private final int _skipComma(int i) throws IOException
     {
         if (i != INT_COMMA) {
+            --_inputPtr; // for correct error reporting
             _reportUnexpectedChar(i, "was expecting comma to separate "+_parsingContext.typeDesc()+" entries");
         }
         while (_inputPtr < _inputEnd) {
@@ -2602,6 +2614,7 @@ private int _skipWSOrEnd2() throws IOException
     private void _skipComment() throws IOException
     {
         if ((_features & FEAT_MASK_ALLOW_JAVA_COMMENTS) == 0) {
+            --_inputPtr; // for correct error reporting
             _reportUnexpectedChar('/', "maybe a (non-standard) comment? (not recognized as one since Feature 'ALLOW_COMMENTS' not enabled for parser)");
         }
         // First: check which comment (if either) it is:
@@ -2614,6 +2627,7 @@ private void _skipComment() throws IOException
         } else if (c == '*') {
             _skipCComment();
         } else {
+            --_inputPtr; // for correct error reporting
             _reportUnexpectedChar(c, "was expecting either '*' or '/' for a comment");
         }
     }
@@ -2725,6 +2739,7 @@ protected char _decodeEscaped() throws IOException
             int ch = (int) _inputBuffer[_inputPtr++];
             int digit = CharTypes.charToHex(ch);
             if (digit < 0) {
+                --_inputPtr; // for correct error reporting
                 _reportUnexpectedChar(ch, "expected a hex-digit for character escape sequence");
             }
             value = (value << 4) | digit;
@@ -3052,6 +3067,7 @@ private void _closeScope(int i) throws JsonParseException {
         if (i == INT_RBRACKET) {
             _updateLocation();
             if (!_parsingContext.inArray()) {
+                --_inputPtr; // for correct error reporting
                 _reportMismatchedEndMarker(i, '}');
             }
             _parsingContext = _parsingContext.clearAndGetParent();
@@ -3060,6 +3076,7 @@ private void _closeScope(int i) throws JsonParseException {
         if (i == INT_RCURLY) {
             _updateLocation();
             if (!_parsingContext.inObject()) {
+                --_inputPtr; // for correct error reporting
                 _reportMismatchedEndMarker(i, ']');
             }
             _parsingContext = _parsingContext.clearAndGetParent();
diff --git a/src/main/java/com/fasterxml/jackson/core/json/UTF8StreamJsonParser.java b/src/main/java/com/fasterxml/jackson/core/json/UTF8StreamJsonParser.java
@@ -779,6 +779,7 @@ public JsonToken nextToken() throws IOException
         // Nope: do we then expect a comma?
         if (_parsingContext.expectComma()) {
             if (i != INT_COMMA) {
+                --_inputPtr; // for correct error reporting
                 _reportUnexpectedChar(i, "was expecting comma to separate "+_parsingContext.typeDesc()+" entries");
             }
             i = _skipWS();
@@ -977,6 +978,7 @@ public boolean nextFieldName(SerializableString str) throws IOException
         // Nope: do we then expect a comma?
         if (_parsingContext.expectComma()) {
             if (i != INT_COMMA) {
+                --_inputPtr; // for correct error reporting
                 _reportUnexpectedChar(i, "was expecting comma to separate "+_parsingContext.typeDesc()+" entries");
             }
             i = _skipWS();
@@ -1062,6 +1064,7 @@ public String nextFieldName() throws IOException
         // Nope: do we then expect a comma?
         if (_parsingContext.expectComma()) {
             if (i != INT_COMMA) {
+                --_inputPtr; // for correct error reporting
                 _reportUnexpectedChar(i, "was expecting comma to separate "+_parsingContext.typeDesc()+" entries");
             }
             i = _skipWS();
@@ -1685,6 +1688,7 @@ private final JsonToken _parseFloat(char[] outBuf, int outPtr, int c,
             // must be followed by sequence of ints, one minimum
             if (fractLen == 0) {
                 if (!isEnabled(JsonReadFeature.ALLOW_TRAILING_DECIMAL_POINT_FOR_NUMBERS.mappedFeature())) {
+                    --_inputPtr; // for correct error reporting
                     _reportUnexpectedNumberChar(c, "Decimal point not followed by a digit");
                 }
             }
@@ -1732,6 +1736,7 @@ private final JsonToken _parseFloat(char[] outBuf, int outPtr, int c,
             }
             // must be followed by sequence of ints, one minimum
             if (expLen == 0) {
+                --_inputPtr; // for correct error reporting
                 _reportUnexpectedNumberChar(c, "Exponent indicator not followed by a digit");
             }
         }
@@ -2144,6 +2149,7 @@ protected String _handleOddName(int ch) throws IOException
         // Allow unquoted names if feature enabled:
         if ((_features & FEAT_MASK_ALLOW_UNQUOTED_NAMES) == 0) {
             char c = (char) _decodeCharForError(ch);
+            --_inputPtr; // for correct error reporting
             _reportUnexpectedChar(c, "was expecting double-quote to start field name");
         }
         /* Also: note that although we use a different table here,
@@ -2153,6 +2159,7 @@ protected String _handleOddName(int ch) throws IOException
         final int[] codes = CharTypes.getInputCodeUtf8JsNames();
         // Also: must start with a valid character...
         if (codes[ch] != 0) {
+            --_inputPtr; // for correct error reporting
             _reportUnexpectedChar(ch, "was expecting either valid name character (for unquoted name) or double-quote (for quoted) to start field name");
         }
 
@@ -2758,6 +2765,7 @@ protected JsonToken _handleUnexpectedValue(int c) throws IOException
         case '}':
             // Error: neither is valid at this point; valid closers have
             // been handled earlier
+            --_inputPtr; // for correct error reporting
             _reportUnexpectedChar(c, "expected a value");
         case '\'':
             if ((_features & FEAT_MASK_ALLOW_SINGLE_QUOTES) != 0) {
@@ -2791,6 +2799,7 @@ protected JsonToken _handleUnexpectedValue(int c) throws IOException
             _reportInvalidToken(""+((char) c), _validJsonTokenList());
         }
         // but if it doesn't look like a token:
+        --_inputPtr; // for correct error reporting
         _reportUnexpectedChar(c, "expected a valid value "+_validJsonValueList());
         return null;
     }
@@ -2923,11 +2932,13 @@ protected JsonToken _handleInvalidNumberStart(int ch, final boolean neg, final b
                     match);
         }
         if (!isEnabled(JsonReadFeature.ALLOW_LEADING_PLUS_SIGN_FOR_NUMBERS.mappedFeature()) && hasSign && !neg) {
+            --_inputPtr; // for correct error reporting
             _reportUnexpectedNumberChar('+', "JSON spec does not allow numbers to have plus signs: enable `JsonReadFeature.ALLOW_LEADING_PLUS_SIGN_FOR_NUMBERS` to allow");
         }
         final String message = neg ?
                 "expected digit (0-9) to follow minus sign, for valid numeric value" :
                 "expected digit (0-9) for valid numeric value";
+        --_inputPtr; // for correct error reporting
         _reportUnexpectedNumberChar(ch, message);
         return null;
     }
@@ -3253,6 +3264,7 @@ private final int _skipColon2(boolean gotColon) throws IOException
                     return i;
                 }
                 if (i != INT_COLON) {
+                    --_inputPtr; // for correct error reporting
                     _reportUnexpectedChar(i, "was expecting a colon to separate field name and value");
                 }
                 gotColon = true;
@@ -3275,6 +3287,7 @@ private final int _skipColon2(boolean gotColon) throws IOException
     private final void _skipComment() throws IOException
     {
         if ((_features & FEAT_MASK_ALLOW_JAVA_COMMENTS) == 0) {
+            --_inputPtr; // for correct error reporting
             _reportUnexpectedChar('/', "maybe a (non-standard) comment? (not recognized as one since Feature 'ALLOW_COMMENTS' not enabled for parser)");
         }
         // First: check which comment (if either) it is:
@@ -3287,6 +3300,7 @@ private final void _skipComment() throws IOException
         } else if (c == INT_ASTERISK) {
             _skipCComment();
         } else {
+            --_inputPtr; // for correct error reporting
             _reportUnexpectedChar(c, "was expecting either '*' or '/' for a comment");
         }
     }
@@ -3432,6 +3446,7 @@ protected char _decodeEscaped() throws IOException
             int ch = _inputBuffer[_inputPtr++];
             int digit = CharTypes.charToHex(ch);
             if (digit < 0) {
+                --_inputPtr; // for correct error reporting
                 _reportUnexpectedChar(ch & 0xFF, "expected a hex-digit for character escape sequence");
             }
             value = (value << 4) | digit;
@@ -3923,6 +3938,7 @@ private final JsonToken _closeScope(int i) throws JsonParseException {
     private final void _closeArrayScope() throws JsonParseException {
         _updateLocation();
         if (!_parsingContext.inArray()) {
+            --_inputPtr; // for correct error reporting
             _reportMismatchedEndMarker(']', '}');
         }
         _parsingContext = _parsingContext.clearAndGetParent();
@@ -3931,6 +3947,7 @@ private final void _closeArrayScope() throws JsonParseException {
     private final void _closeObjectScope() throws JsonParseException {
         _updateLocation();
         if (!_parsingContext.inObject()) {
+            --_inputPtr; // for correct error reporting
             _reportMismatchedEndMarker('}', ']');
         }
         _parsingContext = _parsingContext.clearAndGetParent();
diff --git a/src/main/java/com/fasterxml/jackson/core/json/async/NonBlockingJsonParserBase.java b/src/main/java/com/fasterxml/jackson/core/json/async/NonBlockingJsonParserBase.java
@@ -597,6 +597,7 @@ protected final JsonToken _startObjectScope() throws IOException
     protected final JsonToken _closeArrayScope() throws IOException
     {
         if (!_parsingContext.inArray()) {
+            --_inputPtr; // for correct error reporting
             _reportMismatchedEndMarker(']', '}');
         }
         JsonReadContext ctxt = _parsingContext.getParent();
@@ -617,6 +618,7 @@ protected final JsonToken _closeArrayScope() throws IOException
     protected final JsonToken _closeObjectScope() throws IOException
     {
         if (!_parsingContext.inObject()) {
+            --_inputPtr; // for correct error reporting
             _reportMismatchedEndMarker('}', ']');
         }
         JsonReadContext ctxt = _parsingContext.getParent();
diff --git a/src/main/java/com/fasterxml/jackson/core/json/async/NonBlockingUtf8JsonParserBase.java b/src/main/java/com/fasterxml/jackson/core/json/async/NonBlockingUtf8JsonParserBase.java
diff --git a/src/test/java/com/fasterxml/jackson/failing/read/LocationOfError1173Test.java b/src/test/java/com/fasterxml/jackson/failing/read/LocationOfError1173Test.java

Original file line number	Diff line number	Diff line change
`@@ -769,6 +769,7 @@ public final JsonToken nextToken() throws IOException`
`769`	`769`	`case '}':`
`770`	`770`	`// Error: } is not valid at this point; valid closers have`
`771`	`771`	`// been handled earlier`
	`772`	`+ --_inputPtr; // for correct error reporting`
`772`	`773`	`_reportUnexpectedChar(i, "expected a value");`
`773`	`774`	`case 't':`
`774`	`775`	`_matchTrue();`
`@@ -1455,6 +1456,7 @@ private final JsonToken _parseFloat(int ch, int startPtr, int ptr, boolean neg,`
`1455`	`1456`	`// must be followed by sequence of ints, one minimum`
`1456`	`1457`	`if (fractLen == 0) {`
`1457`	`1458`	`if (!isEnabled(JsonReadFeature.ALLOW_TRAILING_DECIMAL_POINT_FOR_NUMBERS.mappedFeature())) {`
	`1459`	`+ --_inputPtr; // for correct error reporting`
`1458`	`1460`	`_reportUnexpectedNumberChar(ch, "Decimal point not followed by a digit");`
`1459`	`1461`	`}`
`1460`	`1462`	`}`
`@@ -1484,6 +1486,7 @@ private final JsonToken _parseFloat(int ch, int startPtr, int ptr, boolean neg,`
`1484`	`1486`	`}`
`1485`	`1487`	`// must be followed by sequence of ints, one minimum`
`1486`	`1488`	`if (expLen == 0) {`
	`1489`	`+ --_inputPtr; // for correct error reporting`
`1487`	`1490`	`_reportUnexpectedNumberChar(ch, "Exponent indicator not followed by a digit");`
`1488`	`1491`	`}`
`1489`	`1492`	`}`
`@@ -1644,6 +1647,7 @@ private final JsonToken _parseNumber2(boolean neg, int startPtr) throws IOExcept`
`1644`	`1647`	`// must be followed by sequence of ints, one minimum`
`1645`	`1648`	`if (fractLen == 0) {`
`1646`	`1649`	`if (!isEnabled(JsonReadFeature.ALLOW_TRAILING_DECIMAL_POINT_FOR_NUMBERS.mappedFeature())) {`
	`1650`	`+ --_inputPtr; // for correct error reporting`
`1647`	`1651`	`_reportUnexpectedNumberChar(c, "Decimal point not followed by a digit");`
`1648`	`1652`	`}`
`1649`	`1653`	`}`
`@@ -1688,6 +1692,7 @@ private final JsonToken _parseNumber2(boolean neg, int startPtr) throws IOExcept`
`1688`	`1692`	`}`
`1689`	`1693`	`// must be followed by sequence of ints, one minimum`
`1690`	`1694`	`if (expLen == 0) {`
	`1695`	`+ --_inputPtr; // for correct error reporting`
`1691`	`1696`	`_reportUnexpectedNumberChar(c, "Exponent indicator not followed by a digit");`
`1692`	`1697`	`}`
`1693`	`1698`	`}`
`@@ -1788,11 +1793,13 @@ protected JsonToken _handleInvalidNumberStart(int ch, final boolean negative, fi`
`1788`	`1793`	`}`
`1789`	`1794`	`}`
`1790`	`1795`	`if (!isEnabled(JsonReadFeature.ALLOW_LEADING_PLUS_SIGN_FOR_NUMBERS.mappedFeature()) && hasSign && !negative) {`
	`1796`	`+ --_inputPtr; // for correct error reporting`
`1791`	`1797`	_reportUnexpectedNumberChar('+', "JSON spec does not allow numbers to have plus signs: enable `JsonReadFeature.ALLOW_LEADING_PLUS_SIGN_FOR_NUMBERS` to allow");
`1792`	`1798`	`}`
`1793`	`1799`	`final String message = negative ?`
`1794`	`1800`	`"expected digit (0-9) to follow minus sign, for valid numeric value" :`
`1795`	`1801`	`"expected digit (0-9) for valid numeric value";`
	`1802`	`+ --_inputPtr; // for correct error reporting`
`1796`	`1803`	`_reportUnexpectedNumberChar(ch, message);`
`1797`	`1804`	`return null;`
`1798`	`1805`	`}`
`@@ -1940,6 +1947,7 @@ protected String _handleOddName(int i) throws IOException`
`1940`	`1947`	`}`
`1941`	`1948`	`// [JACKSON-69]: allow unquoted names if feature enabled:`
`1942`	`1949`	`if ((_features & FEAT_MASK_ALLOW_UNQUOTED_NAMES) == 0) {`
	`1950`	`+ --_inputPtr; // for correct error reporting`
`1943`	`1951`	`_reportUnexpectedChar(i, "was expecting double-quote to start field name");`
`1944`	`1952`	`}`
`1945`	`1953`	`final int[] codes = CharTypes.getInputCodeLatin1JsNames();`
`@@ -1954,6 +1962,7 @@ protected String _handleOddName(int i) throws IOException`
`1954`	`1962`	`firstOk = Character.isJavaIdentifierPart((char) i);`
`1955`	`1963`	`}`
`1956`	`1964`	`if (!firstOk) {`
	`1965`	`+ --_inputPtr; // for correct error reporting`
`1957`	`1966`	`_reportUnexpectedChar(i, "was expecting either valid name character (for unquoted name) or double-quote (for quoted) to start field name");`
`1958`	`1967`	`}`
`1959`	`1968`	`int ptr = _inputPtr;`
`@@ -2085,6 +2094,7 @@ protected JsonToken _handleOddValue(int i) throws IOException`
`2085`	`2094`	`_reportInvalidToken(""+((char) i), _validJsonTokenList());`
`2086`	`2095`	`}`
`2087`	`2096`	`// but if it doesn't look like a token:`
	`2097`	`+ --_inputPtr; // for correct error reporting`
`2088`	`2098`	`_reportUnexpectedChar(i, "expected a valid value "+_validJsonValueList());`
`2089`	`2099`	`return null;`
`2090`	`2100`	`}`
`@@ -2387,6 +2397,7 @@ private final int _skipColon2(boolean gotColon) throws IOException`
`2387`	`2397`	`return i;`
`2388`	`2398`	`}`
`2389`	`2399`	`if (i != INT_COLON) {`
	`2400`	`+ --_inputPtr; // for correct error reporting`
`2390`	`2401`	`_reportUnexpectedChar(i, "was expecting a colon to separate field name and value");`
`2391`	`2402`	`}`
`2392`	`2403`	`gotColon = true;`
`@@ -2460,6 +2471,7 @@ private final int _skipColonFast(int ptr) throws IOException`
`2460`	`2471`	`private final int _skipComma(int i) throws IOException`
`2461`	`2472`	`{`
`2462`	`2473`	`if (i != INT_COMMA) {`
	`2474`	`+ --_inputPtr; // for correct error reporting`
`2463`	`2475`	`_reportUnexpectedChar(i, "was expecting comma to separate "+_parsingContext.typeDesc()+" entries");`
`2464`	`2476`	`}`
`2465`	`2477`	`while (_inputPtr < _inputEnd) {`
`@@ -2602,6 +2614,7 @@ private int _skipWSOrEnd2() throws IOException`
`2602`	`2614`	`private void _skipComment() throws IOException`
`2603`	`2615`	`{`
`2604`	`2616`	`if ((_features & FEAT_MASK_ALLOW_JAVA_COMMENTS) == 0) {`
	`2617`	`+ --_inputPtr; // for correct error reporting`
`2605`	`2618`	`_reportUnexpectedChar('/', "maybe a (non-standard) comment? (not recognized as one since Feature 'ALLOW_COMMENTS' not enabled for parser)");`
`2606`	`2619`	`}`
`2607`	`2620`	`// First: check which comment (if either) it is:`
`@@ -2614,6 +2627,7 @@ private void _skipComment() throws IOException`
`2614`	`2627`	`} else if (c == '*') {`
`2615`	`2628`	`_skipCComment();`
`2616`	`2629`	`} else {`
	`2630`	`+ --_inputPtr; // for correct error reporting`
`2617`	`2631`	`_reportUnexpectedChar(c, "was expecting either '*' or '/' for a comment");`
`2618`	`2632`	`}`
`2619`	`2633`	`}`
`@@ -2725,6 +2739,7 @@ protected char _decodeEscaped() throws IOException`
`2725`	`2739`	`int ch = (int) _inputBuffer[_inputPtr++];`
`2726`	`2740`	`int digit = CharTypes.charToHex(ch);`
`2727`	`2741`	`if (digit < 0) {`
	`2742`	`+ --_inputPtr; // for correct error reporting`
`2728`	`2743`	`_reportUnexpectedChar(ch, "expected a hex-digit for character escape sequence");`
`2729`	`2744`	`}`
`2730`	`2745`	`value = (value << 4) \| digit;`
`@@ -3052,6 +3067,7 @@ private void _closeScope(int i) throws JsonParseException {`
`3052`	`3067`	`if (i == INT_RBRACKET) {`
`3053`	`3068`	`_updateLocation();`
`3054`	`3069`	`if (!_parsingContext.inArray()) {`
	`3070`	`+ --_inputPtr; // for correct error reporting`
`3055`	`3071`	`_reportMismatchedEndMarker(i, '}');`
`3056`	`3072`	`}`
`3057`	`3073`	`_parsingContext = _parsingContext.clearAndGetParent();`
`@@ -3060,6 +3076,7 @@ private void _closeScope(int i) throws JsonParseException {`
`3060`	`3076`	`if (i == INT_RCURLY) {`
`3061`	`3077`	`_updateLocation();`
`3062`	`3078`	`if (!_parsingContext.inObject()) {`
	`3079`	`+ --_inputPtr; // for correct error reporting`
`3063`	`3080`	`_reportMismatchedEndMarker(i, ']');`
`3064`	`3081`	`}`
`3065`	`3082`	`_parsingContext = _parsingContext.clearAndGetParent();`
Original file line number	Diff line number	Diff line change
`@@ -779,6 +779,7 @@ public JsonToken nextToken() throws IOException`
`779`	`779`	`// Nope: do we then expect a comma?`
`780`	`780`	`if (_parsingContext.expectComma()) {`
`781`	`781`	`if (i != INT_COMMA) {`
	`782`	`+ --_inputPtr; // for correct error reporting`
`782`	`783`	`_reportUnexpectedChar(i, "was expecting comma to separate "+_parsingContext.typeDesc()+" entries");`
`783`	`784`	`}`
`784`	`785`	`i = _skipWS();`
`@@ -977,6 +978,7 @@ public boolean nextFieldName(SerializableString str) throws IOException`
`977`	`978`	`// Nope: do we then expect a comma?`
`978`	`979`	`if (_parsingContext.expectComma()) {`
`979`	`980`	`if (i != INT_COMMA) {`
	`981`	`+ --_inputPtr; // for correct error reporting`
`980`	`982`	`_reportUnexpectedChar(i, "was expecting comma to separate "+_parsingContext.typeDesc()+" entries");`
`981`	`983`	`}`
`982`	`984`	`i = _skipWS();`
`@@ -1062,6 +1064,7 @@ public String nextFieldName() throws IOException`
`1062`	`1064`	`// Nope: do we then expect a comma?`
`1063`	`1065`	`if (_parsingContext.expectComma()) {`
`1064`	`1066`	`if (i != INT_COMMA) {`
	`1067`	`+ --_inputPtr; // for correct error reporting`
`1065`	`1068`	`_reportUnexpectedChar(i, "was expecting comma to separate "+_parsingContext.typeDesc()+" entries");`
`1066`	`1069`	`}`
`1067`	`1070`	`i = _skipWS();`
`@@ -1685,6 +1688,7 @@ private final JsonToken _parseFloat(char[] outBuf, int outPtr, int c,`
`1685`	`1688`	`// must be followed by sequence of ints, one minimum`
`1686`	`1689`	`if (fractLen == 0) {`
`1687`	`1690`	`if (!isEnabled(JsonReadFeature.ALLOW_TRAILING_DECIMAL_POINT_FOR_NUMBERS.mappedFeature())) {`
	`1691`	`+ --_inputPtr; // for correct error reporting`
`1688`	`1692`	`_reportUnexpectedNumberChar(c, "Decimal point not followed by a digit");`
`1689`	`1693`	`}`
`1690`	`1694`	`}`
`@@ -1732,6 +1736,7 @@ private final JsonToken _parseFloat(char[] outBuf, int outPtr, int c,`
`1732`	`1736`	`}`
`1733`	`1737`	`// must be followed by sequence of ints, one minimum`
`1734`	`1738`	`if (expLen == 0) {`
	`1739`	`+ --_inputPtr; // for correct error reporting`
`1735`	`1740`	`_reportUnexpectedNumberChar(c, "Exponent indicator not followed by a digit");`
`1736`	`1741`	`}`
`1737`	`1742`	`}`
`@@ -2144,6 +2149,7 @@ protected String _handleOddName(int ch) throws IOException`
`2144`	`2149`	`// Allow unquoted names if feature enabled:`
`2145`	`2150`	`if ((_features & FEAT_MASK_ALLOW_UNQUOTED_NAMES) == 0) {`
`2146`	`2151`	`char c = (char) _decodeCharForError(ch);`
	`2152`	`+ --_inputPtr; // for correct error reporting`
`2147`	`2153`	`_reportUnexpectedChar(c, "was expecting double-quote to start field name");`
`2148`	`2154`	`}`
`2149`	`2155`	`/* Also: note that although we use a different table here,`
`@@ -2153,6 +2159,7 @@ protected String _handleOddName(int ch) throws IOException`
`2153`	`2159`	`final int[] codes = CharTypes.getInputCodeUtf8JsNames();`
`2154`	`2160`	`// Also: must start with a valid character...`
`2155`	`2161`	`if (codes[ch] != 0) {`
	`2162`	`+ --_inputPtr; // for correct error reporting`
`2156`	`2163`	`_reportUnexpectedChar(ch, "was expecting either valid name character (for unquoted name) or double-quote (for quoted) to start field name");`
`2157`	`2164`	`}`
`2158`	`2165`
`@@ -2758,6 +2765,7 @@ protected JsonToken _handleUnexpectedValue(int c) throws IOException`
`2758`	`2765`	`case '}':`
`2759`	`2766`	`// Error: neither is valid at this point; valid closers have`
`2760`	`2767`	`// been handled earlier`
	`2768`	`+ --_inputPtr; // for correct error reporting`
`2761`	`2769`	`_reportUnexpectedChar(c, "expected a value");`
`2762`	`2770`	`case '\'':`
`2763`	`2771`	`if ((_features & FEAT_MASK_ALLOW_SINGLE_QUOTES) != 0) {`
`@@ -2791,6 +2799,7 @@ protected JsonToken _handleUnexpectedValue(int c) throws IOException`
`2791`	`2799`	`_reportInvalidToken(""+((char) c), _validJsonTokenList());`
`2792`	`2800`	`}`
`2793`	`2801`	`// but if it doesn't look like a token:`
	`2802`	`+ --_inputPtr; // for correct error reporting`
`2794`	`2803`	`_reportUnexpectedChar(c, "expected a valid value "+_validJsonValueList());`
`2795`	`2804`	`return null;`
`2796`	`2805`	`}`
`@@ -2923,11 +2932,13 @@ protected JsonToken _handleInvalidNumberStart(int ch, final boolean neg, final b`
`2923`	`2932`	`match);`
`2924`	`2933`	`}`
`2925`	`2934`	`if (!isEnabled(JsonReadFeature.ALLOW_LEADING_PLUS_SIGN_FOR_NUMBERS.mappedFeature()) && hasSign && !neg) {`
	`2935`	`+ --_inputPtr; // for correct error reporting`
`2926`	`2936`	_reportUnexpectedNumberChar('+', "JSON spec does not allow numbers to have plus signs: enable `JsonReadFeature.ALLOW_LEADING_PLUS_SIGN_FOR_NUMBERS` to allow");
`2927`	`2937`	`}`
`2928`	`2938`	`final String message = neg ?`
`2929`	`2939`	`"expected digit (0-9) to follow minus sign, for valid numeric value" :`
`2930`	`2940`	`"expected digit (0-9) for valid numeric value";`
	`2941`	`+ --_inputPtr; // for correct error reporting`
`2931`	`2942`	`_reportUnexpectedNumberChar(ch, message);`
`2932`	`2943`	`return null;`
`2933`	`2944`	`}`
`@@ -3253,6 +3264,7 @@ private final int _skipColon2(boolean gotColon) throws IOException`
`3253`	`3264`	`return i;`
`3254`	`3265`	`}`
`3255`	`3266`	`if (i != INT_COLON) {`
	`3267`	`+ --_inputPtr; // for correct error reporting`
`3256`	`3268`	`_reportUnexpectedChar(i, "was expecting a colon to separate field name and value");`
`3257`	`3269`	`}`
`3258`	`3270`	`gotColon = true;`
`@@ -3275,6 +3287,7 @@ private final int _skipColon2(boolean gotColon) throws IOException`
`3275`	`3287`	`private final void _skipComment() throws IOException`
`3276`	`3288`	`{`
`3277`	`3289`	`if ((_features & FEAT_MASK_ALLOW_JAVA_COMMENTS) == 0) {`
	`3290`	`+ --_inputPtr; // for correct error reporting`
`3278`	`3291`	`_reportUnexpectedChar('/', "maybe a (non-standard) comment? (not recognized as one since Feature 'ALLOW_COMMENTS' not enabled for parser)");`
`3279`	`3292`	`}`
`3280`	`3293`	`// First: check which comment (if either) it is:`
`@@ -3287,6 +3300,7 @@ private final void _skipComment() throws IOException`
`3287`	`3300`	`} else if (c == INT_ASTERISK) {`
`3288`	`3301`	`_skipCComment();`
`3289`	`3302`	`} else {`
	`3303`	`+ --_inputPtr; // for correct error reporting`
`3290`	`3304`	`_reportUnexpectedChar(c, "was expecting either '*' or '/' for a comment");`
`3291`	`3305`	`}`
`3292`	`3306`	`}`
`@@ -3432,6 +3446,7 @@ protected char _decodeEscaped() throws IOException`
`3432`	`3446`	`int ch = _inputBuffer[_inputPtr++];`
`3433`	`3447`	`int digit = CharTypes.charToHex(ch);`
`3434`	`3448`	`if (digit < 0) {`
	`3449`	`+ --_inputPtr; // for correct error reporting`
`3435`	`3450`	`_reportUnexpectedChar(ch & 0xFF, "expected a hex-digit for character escape sequence");`
`3436`	`3451`	`}`
`3437`	`3452`	`value = (value << 4) \| digit;`
`@@ -3923,6 +3938,7 @@ private final JsonToken _closeScope(int i) throws JsonParseException {`
`3923`	`3938`	`private final void _closeArrayScope() throws JsonParseException {`
`3924`	`3939`	`_updateLocation();`
`3925`	`3940`	`if (!_parsingContext.inArray()) {`
	`3941`	`+ --_inputPtr; // for correct error reporting`
`3926`	`3942`	`_reportMismatchedEndMarker(']', '}');`
`3927`	`3943`	`}`
`3928`	`3944`	`_parsingContext = _parsingContext.clearAndGetParent();`
`@@ -3931,6 +3947,7 @@ private final void _closeArrayScope() throws JsonParseException {`
`3931`	`3947`	`private final void _closeObjectScope() throws JsonParseException {`
`3932`	`3948`	`_updateLocation();`
`3933`	`3949`	`if (!_parsingContext.inObject()) {`
	`3950`	`+ --_inputPtr; // for correct error reporting`
`3934`	`3951`	`_reportMismatchedEndMarker('}', ']');`
`3935`	`3952`	`}`
`3936`	`3953`	`_parsingContext = _parsingContext.clearAndGetParent();`
Original file line number	Diff line number	Diff line change
`@@ -597,6 +597,7 @@ protected final JsonToken _startObjectScope() throws IOException`
`597`	`597`	`protected final JsonToken _closeArrayScope() throws IOException`
`598`	`598`	`{`
`599`	`599`	`if (!_parsingContext.inArray()) {`
	`600`	`+ --_inputPtr; // for correct error reporting`
`600`	`601`	`_reportMismatchedEndMarker(']', '}');`
`601`	`602`	`}`
`602`	`603`	`JsonReadContext ctxt = _parsingContext.getParent();`
`@@ -617,6 +618,7 @@ protected final JsonToken _closeArrayScope() throws IOException`
`617`	`618`	`protected final JsonToken _closeObjectScope() throws IOException`
`618`	`619`	`{`
`619`	`620`	`if (!_parsingContext.inObject()) {`
	`621`	`+ --_inputPtr; // for correct error reporting`
`620`	`622`	`_reportMismatchedEndMarker('}', ']');`
`621`	`623`	`}`
`622`	`624`	`JsonReadContext ctxt = _parsingContext.getParent();`