Some more fixes to non-standard numbers, almost there

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/core/json/ReaderBasedJsonParser.java

@@ -211,7 +211,7 @@ public int releaseBuffered(Writer w) throws IOException {
     protected char getNextChar(String eofMsg) throws IOException {
         return getNextChar(eofMsg, null);
     }
-    
+
     protected char getNextChar(String eofMsg, JsonToken forToken) throws IOException {
         if (_inputPtr >= _inputEnd) {
             if (!_loadMore()) {
@@ -1576,6 +1576,7 @@ private final JsonToken _parseNumber2(boolean neg, int startPtr) throws IOExcept
         int intLen = 0;
         char c = (_inputPtr < _inputEnd) ? _inputBuffer[_inputPtr++]
                 : getNextChar("No digit following minus sign", JsonToken.VALUE_NUMBER_INT);
+        
         if (c == '0') {
             c = _verifyNoLeadingZeroes();
         }
@@ -1606,9 +1607,10 @@ private final JsonToken _parseNumber2(boolean neg, int startPtr) throws IOExcept
             }
         }
 
-        int fractLen = 0;
+        int fractLen = -1;
         // And then see if we get other parts
         if (c == '.') { // yes, fraction
+            fractLen = 0;
             if (outPtr >= outBuf.length) {
                 outBuf = _textBuffer.finishCurrentSegment();
                 outPtr = 0;
@@ -1640,16 +1642,17 @@ private final JsonToken _parseNumber2(boolean neg, int startPtr) throws IOExcept
             }
         }
 
-        int expLen = 0;
+        int expLen = -1;
         if (c == 'e' || c == 'E') { // exponent?
+            expLen = 0;
             if (outPtr >= outBuf.length) {
                 outBuf = _textBuffer.finishCurrentSegment();
                 outPtr = 0;
             }
             outBuf[outPtr++] = c;
             // Not optional, can require that we get one more char
             c = (_inputPtr < _inputEnd) ? _inputBuffer[_inputPtr++]
-                : getNextChar("expected a digit for number exponent");
+                : getNextChar("expected a digit for number exponent", JsonToken.VALUE_NUMBER_FLOAT);
             // Sign indicator?
             if (c == '-' || c == '+') {
                 if (outPtr >= outBuf.length) {
@@ -1659,7 +1662,7 @@ private final JsonToken _parseNumber2(boolean neg, int startPtr) throws IOExcept
                 outBuf[outPtr++] = c;
                 // Likewise, non optional:
                 c = (_inputPtr < _inputEnd) ? _inputBuffer[_inputPtr++]
-                    : getNextChar("expected a digit for number exponent");
+                    : getNextChar("expected a digit for number exponent", JsonToken.VALUE_NUMBER_FLOAT);
             }
 
             exp_loop:
@@ -1690,8 +1693,14 @@ private final JsonToken _parseNumber2(boolean neg, int startPtr) throws IOExcept
             }
         }
         _textBuffer.setCurrentLength(outPtr);
+
         // And there we have it!
-        return reset(neg, intLen, fractLen, expLen);
+        // 26-Jun-2022, tatu: Careful here, as non-standard numbers can
+        //    cause surprises - cannot use plain "reset()" but apply diff logic
+        if (fractLen < 0 && expLen < 0) { // integer
+            return resetInt(neg, intLen);
+        }
+        return resetFloat(neg, intLen, fractLen, expLen);
     }
 
     // Method called when we have seen one zero, and want to ensure

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

@@ -39,7 +39,7 @@ public void testLeadingDotInDecimal() throws Exception {
     /*
      * The format "+NNN" (as opposed to "NNN") is not valid JSON, so this should fail
      */
-    public void testLeadingPlusSignInDecimal() throws Exception {
+    public void testLeadingPlusSignInDecimalDefaultFail() throws Exception {
         for (int mode : ALL_MODES) {
             try (JsonParser p = createParser(mode, " +123 ")) {
                 p.nextToken();
@@ -97,7 +97,7 @@ public void testTrailingDotInDecimalAllowedBytes() throws Exception {
 
     public void testTrailingDotInDecimalAllowedReader() throws Exception {
         _testTrailingDotInDecimalAllowed(jsonFactory(), MODE_READER);
-//        _testTrailingDotInDecimalAllowed(jsonFactory(), MODE_READER_THROTTLED);
+        _testTrailingDotInDecimalAllowed(jsonFactory(), MODE_READER_THROTTLED);
     }
 
     public void testLeadingPlusSignInDecimalAllowedDataInput() throws Exception {
@@ -125,7 +125,7 @@ public void testLeadingDotInNegativeDecimalAllowedBytes() throws Exception {
 
     public void testLeadingDotInNegativeDecimalAllowedReader() throws Exception {
         _testLeadingDotInNegativeDecimalAllowed(jsonFactory(), MODE_READER);
-//        _testLeadingDotInNegativeDecimalAllowed(jsonFactory(), MODE_READER_THROTTLED);
+        _testLeadingDotInNegativeDecimalAllowed(jsonFactory(), MODE_READER_THROTTLED);
     }
 
     private void _testLeadingDotInDecimalAllowed(JsonFactory f, int mode) throws Exception